diff --git a/docs/upgrades/upgrade_7.9.7-7.9.8.pl b/docs/upgrades/upgrade_7.9.7-7.9.8.pl
index 04e8ae855..5a9b7280b 100644
--- a/docs/upgrades/upgrade_7.9.7-7.9.8.pl
+++ b/docs/upgrades/upgrade_7.9.7-7.9.8.pl
@@ -58,6 +58,7 @@ sub addTwitterAuth {
     $session->config->addToArray( 'authMethods', 'Twitter' );
     $session->config->addToHash( 'macros', "TwitterLogin" => "TwitterLogin" );
     $session->setting->set( 'twitterEnabled', 0 );
+    $session->setting->set( 'twitterTemplateIdChooseUsername', 'mfHGkp6t9gdclmzN33OEnw' );
 
     print "DONE!\n" unless $quiet;
 }
diff --git a/lib/WebGUI/Auth/Twitter.pm b/lib/WebGUI/Auth/Twitter.pm
index c8c0bb93c..b257bf3a3 100644
--- a/lib/WebGUI/Auth/Twitter.pm
+++ b/lib/WebGUI/Auth/Twitter.pm
@@ -103,6 +103,14 @@ sub editUserSettingsForm {
         hoverHelp   => $i18n->get('consumer secret help'),
     );
 
+    $f->template(
+        name        => 'twitterTemplateIdChooseUsername',
+        value       => $setting->get( 'twitterTemplateIdChooseUsername' ),
+        label       => $i18n->get('choose username template'),
+        hoverHelp   => $i18n->get('choose username template help'),
+        namespace   => 'Auth/Twitter/ChooseUsername',
+    );
+
     return $f->printRowsOnly;
 }
 
@@ -119,7 +127,10 @@ sub editUserSettingsFormSave {
     my $session = $self->session;
     my ( $form, $setting ) = $session->quick(qw( form setting ));
 
-    my @fields  = qw( twitterEnabled twitterConsumerKey twitterConsumerSecret );
+    my @fields  = qw( 
+        twitterEnabled twitterConsumerKey twitterConsumerSecret 
+        twitterTemplateIdChooseUsername 
+    );
     for my $field ( @fields ) {
         $setting->set( $field, $form->get( $field ) );
     }
@@ -129,6 +140,20 @@ sub editUserSettingsFormSave {
 
 #----------------------------------------------------------------------------
 
+=head2 getTemplateChooseUsername ( )
+
+Get the template to choose a username
+
+=cut
+
+sub getTemplateChooseUsername {
+    my ( $self ) = @_;
+    my $templateId  = $self->session->setting->get('twitterTemplateIdChooseUsername');
+    return WebGUI::Asset::Template->new( $self->session, $templateId );
+}
+
+#----------------------------------------------------------------------------
+
 =head2 www_login ( )
 
 Begin the login procedure
@@ -208,16 +233,12 @@ sub www_callback {
 
     # Otherwise ask them for a new username to use
     $scratch->set( "AuthTwitterUserId", $twitterUserId );
-    my $output  = '<h1>^International("choose username title","Auth_Twitter");</h1>'
-                . '<p>^International("twitter screen name taken","Auth_Twitter","<tmpl_var username>");</p>'
-                . '<form><input type="hidden" name="op" value="auth" />'
-                . '<input type="hidden" name="authType" value="Twitter" />'
-                . '<input type="hidden" name="method" value="setUsername" />'
-                . '<input type="text" name="newUsername" value="" />'
-                . '<input type="submit" />'
-                . '</form>'
-                ;
-    return $output;
+    my $tmpl    = $self->getTemplateChooseUsername;
+    my $var     = {
+        message     => sprintf( $i18n->get("twitter screen name taken"), $twitterScreenName ),
+    };
+
+    return $tmpl->process( $var );
 }
 
 #----------------------------------------------------------------------------
@@ -243,16 +264,12 @@ sub www_setUsername {
     }
 
     # Username is again taken! Noooooo!
-    my $output  = '<h1>^International("choose username title","Auth_Twitter");</h1>'
-                . '<p>^International("webgui username taken","Auth_Twitter","<tmpl_var username>");</p>'
-                . '<form><input type="hidden" name="op" value="auth" />'
-                . '<input type="hidden" name="authType" value="Twitter" />'
-                . '<input type="hidden" name="method" value="setUsername" />'
-                . '<input type="text" name="newUsername" value="" />'
-                . '<input type="submit" />'
-                . '</form>'
-                ;
-    return $output;
+    my $tmpl    = $self->getTemplateChooseUsername;
+    my $var     = {
+        message     => sprintf( $i18n->get("webgui username taken"), $username ),
+    };
+
+    return $tmpl->process( $var );
 }
 
 1;