Fix for possible future errors for Admin Add User