Pre Vishwakarandak changes
Changed login.py after merging with ajinkya's last commit