Merge pull request #961 from tarunc/master

Login Fix