diff --git a/BrowserExtensions/common/casajar/content/casaOverlay.js b/BrowserExtensions/common/casajar/content/casaOverlay.js
index e352ab12..5371c537 100644
--- a/BrowserExtensions/common/casajar/content/casaOverlay.js
+++ b/BrowserExtensions/common/casajar/content/casaOverlay.js
@@ -496,37 +496,27 @@ function websso()
 	    {
 	        try 
 	        {
-	        if((para.item(j).type == "text") || (para.item(j).type == "password"))
-	        {	            
-    		    sKey = para.item(j).name;
-                logMessage('Getting: '  + secretId + ':' + sKey);		                           
-                
-                theValue = new String;                                
-		        res = obj.miCASAReadKey(secretId, sKey, theValue);		    
-    		    
-		        if (res == 0)
-		        {	    	    				 	
-			        var ele = window._content.document.getElementsByName(sKey);        						
-			        if (ele != null)
-			        {
-				        ele[0].value = theValue.value;		                                                 
-			        }
+	            if((para.item(j).type == "text") || (para.item(j).type == "password"))
+	            {	            
+    		        sKey = para.item(j).name;
+                    logMessage('Getting: '  + secretId + ':' + sKey);		                           
+                    
+                    theValue = new String;                                
+		            res = obj.miCASAReadKey(secretId, sKey, theValue);		    
+        		    
+		            if (res == 0)
+		            {	    	    				 	
+			            var ele = window._content.document.getElementsByName(sKey);        						
+			            if (ele != null)
+			            {
+				            ele[0].value = theValue.value;
+				            if (ele[0].type == "password")
+				            {
+				                formToSubmit = ele[0].form;
+				            }				        		                                                 
+			            }
+		            }		       		        
 		        }
-		        
-		        // locate and save off the form of the password element
-		        if (para.item(j).type == "password")
-		        {		            
-		            formToSubmit = para.item(j).parentNode.parentNode;
-		            		            
-		            // did we get it?
-		            if (formToSubmit.type != "form")
-		            {
-		                formToSubmit = formToSubmit.parentNode;		                
-		            }		            		            
-		            		            
-		        }
-		        
-		    }
 		    }
 		    catch (err)
 		    {
@@ -561,7 +551,8 @@ function websso()
                 }
                 else
                 {
-                    formToSubmit = window._content.document.forms[0].submit();                                
+                    //formToSubmit = window._content.document.forms[0].submit();                                
+                    logMessage("One form");
                 }
                 
                 //try it now
@@ -1273,3 +1264,5 @@ logMessage('adding event listener');
 window.addEventListener("load",websso,true) ;
 window.addEventListener("submit",promptuser,true) ;
 
+//HTMLFormElement.prototype._submit = HTMLFormElement.prototype.submit;
+//HTMLFormElement.prototype.submit = promptuser;
\ No newline at end of file