Cleaner edit in user controller
Merge branch 'Re-routing'