Improve handling of admin username/password