Fixing Admins end

This time for 1.1 please merge to master too