fixed bug in admin_user method logic
merge squahsed kept my changes to admin_user