Fixed current user function