use edited login-server to avoid password written to logs
Merge commit '5c904d2' into v1-local