Fix handling of user creation forms