Add User to BaseController
Base Controller Change
Merged