Fixed redirection issues when changing the Users in different ways in Settings
Getting eric's stuff
merged files for first time
Let's make admins