diff --git a/ga_login.install b/ga_login.install
index a10800c..07a7632 100644
--- a/ga_login.install
+++ b/ga_login.install
@@ -34,6 +34,7 @@ function ga_login_schema() {
  * Implements hook_uninstall().
  */
 function ga_login_uninstall() {
+  variable_del('ga_login_textname');
   variable_del('ga_login_textid');
 }
 
diff --git a/ga_login.module b/ga_login.module
index 877d8ac..c4c659e 100644
--- a/ga_login.module
+++ b/ga_login.module
@@ -532,7 +532,8 @@ function ga_login_mobile_codes_default_mobile_codes_preset_alter(&$export) {
  * Create a site specific username.
  */
 function _ga_login_username($account, $encode = TRUE) {
-  $username = $account->name . '@' . variable_get('site_name', 'Drupal');
+  $site_name = variable_get('site_name', 'Drupal');
+  $username = $account->name . '@' . variable_get('ga_login_textname', $site_name);
   $textid = variable_get('ga_login_textid', '');
   $username .= (empty($textid)) ? '' : ':' . $textid;
   return $encode ? rawurlencode($username) : $username;