Merge pull request #1222 from janmatzek/jmat-do-not-modify-admin-user

Merge pull request #1222 from janmatzek/jmat-do-not-modify-admin-user #390