Some Fixes to Login Menu