Merge "Fix server admin password usage"