Login Adjustments

#610 #572