Updated login controller
Merge conflict