Several Changes to the Admin/User model

*Note that global.php has a change.