Support for logging in or out with a certain user.
Merge commit '793a452e1be480e1046fa40a6ec0992ded84c9b7'