Email Registration - Allow username when registering

email_registration__allow_username_when_registering.patch

diff --git a/email_registration.module b/email_registration.module
index e172bd2..056c800 100644
--- a/email_registration.module
+++ b/email_registration.module
@@ -123,9 +123,6 @@ function email_registration_cleanup_username($name) {
  * Implements hook_form_FORM_ID_alter().
  */
 function email_registration_form_user_register_form_alter(&$form, FormStateInterface $form_state) {
-  $form['account']['name']['#type'] = 'value';
-  $form['account']['name']['#value'] = 'email_registration_' . user_password();
-  $form['account']['mail']['#title'] = t('E-mail');
 }
 
 /**
@@ -144,8 +141,8 @@ function email_registration_form_user_pass_alter(&$form, FormStateInterface $for
 function email_registration_form_user_login_form_alter(&$form, FormStateInterface $form_state) {
   $config = \Drupal::config('email_registration.settings');
   $login_with_username = $config->get('login_with_username');
-  $form['name']['#title'] = $login_with_username ? t('E-mail or username') : t('E-mail');
-  $form['name']['#description'] = $login_with_username ? t('Enter your e-mail address or username.') : t('Enter your e-mail address.');
+  $form['name']['#title'] = $login_with_username ? t('E-mail or display name') : t('E-mail');
+  $form['name']['#description'] = $login_with_username ? t('Enter your e-mail address or display name.') : t('Enter your e-mail address.');
   $form['name']['#element_validate'][] = 'email_registration_user_login_validate';
   $form['pass']['#description'] = t('Enter the password that accompanies your e-mail.');
   // Allow client side validation of input format.