Refactor user to prepare for kerberos