Pull request for: changes to the login #179 #178