modified login controller
Merge branch 'issue-188' into develop