Issue refs #1691: refactoring user model