Added extra checks for User Creation