CustomerEmailLogin refactor