Submitting fix to 1234-bug-login