Merge "Userlogin.php: Tweaks and corrections"