When using authenticationFlowType USER_PASSWORD_AUTH - device key saved in preferences under email but retrieved with username, causing refresh token failure

When using authenticationFlowType USER_PASSWORD_AUTH - device key saved in preferences under email but retrieved with username, causing refresh token failure #424