Fix Authentication controller
Merge Conflicts