Removed the user login changes
Merge branch 'development'