User Management - Fixing up issues after code merge up - Abdul