cce4de0 more fixes

Authored and Committed by rstrode 8 years ago
    more fixes
    
    - Fix password handoff in non-autologin case
    - Remove unneccessary part of autologin fix
    
    Related: #1269581
    
        
file modified
+161 -15
file modified
+6 -2