login_fix

fixes for #1504 :-)