Proper user authentication
Fixed merge conflict