Bug fixes
Removed Amateur user type