Trying to reduce code duplication with "restorer", so far looking good. Next step LoginActivity UserInfo duplication cleanup