Fixing a couple of issues with the login form