Refactored user form before filtering out fields based on user type