diff --git a/tokenauth.inc b/tokenauth.inc
index 54b3f2f..7ed7323 100644
--- a/tokenauth.inc
+++ b/tokenauth.inc
@@ -163,21 +163,16 @@ function tokenauth_reset_user_form($uid, $label = NULL, $token = NULL) {
  *  Whether to pass along the raw text or render using specific input format. (And token replacement, if enabled.)
  */
 function tokenauth_text_load($account = NULL, $render = FALSE) {
-  $tokenauth_text = variable_get('tokenauth_text', array());
-
-  if (empty($tokenauth_text)) {
-    $tokenauth_text['value'] =<<<EOT
-You may use an alphanumeric token to see restricted content using RSS Feed Readers or other simple content viewers. This token authenticates your user account, and as unique to you. If you have reason to believe someone else is misusing your token, please press the <em>Reset token</em> button to get a new one, and update your RSS readers.
-
-Append the string below to the end of URLs approved for use with Token Authentication for temporary authentication.
-EOT;
+  $tokenauth_text = array(
+    'value' => t("<p>You may use an alphanumeric token to see restricted content using RSS Feed Readers or other simple content viewers. This token authenticates your user account, and is unique to you. If you have reason to believe someone else is misusing your token, please press the <em>Reset token</em> button to get a new one, and update your RSS readers.</p><p>Append the string below to the end of URLs approved for use with Token Authentication for temporary authentication.</p>"),
+    'format' => filter_format_exists('full_html') ? 'full_html' : filter_fallback_format(),  
+  );
 
-    if (module_exists('token')) {
-      $key = tokenauth_get_token_key();
-      $tokenauth_text['value'] .= "\n\n<strong>Your token:</strong> ?$key=<code>[user:tokenauth-token]</code>";
-    }
-    $tokenauth_text['format'] = filter_format_exists('filtered_html') ? 'filtered_html' : filter_fallback_format();
+  if (module_exists('token')) {
+    $key = tokenauth_get_token_key();
+    $tokenauth_text['value'] .= '<p>' . t("<strong>Your token:</strong> !key", array('!key' => "?$key=<code>[user:tokenauth-token]</code>")) . '</p>';
   }
+  
   if (!$render) {
     return $tokenauth_text;
   }
diff --git a/tokenauth.install b/tokenauth.install
index b24fdab..fcb9f7c 100644
--- a/tokenauth.install
+++ b/tokenauth.install
@@ -60,7 +60,6 @@ function tokenauth_uninstall() {
   variable_del('tokenauth_length');
   variable_del('tokenauth_pages');
   variable_del('tokenauth_reset');
-  variable_del('tokenauth_text');
 }
 
 /**
@@ -74,3 +73,10 @@ function tokenauth_update_7000() {
     variable_set('tokenauth_text', $text);
   }
 }
+
+/**
+ * Remove old variable 'tokenauth_text'
+ */
+function tokenauth_update_7001() {
+  variable_del('tokenauth_text');
+}
\ No newline at end of file
diff --git a/tokenauth.pages.inc b/tokenauth.pages.inc
index 2a7db5f..b9d8d37 100644
--- a/tokenauth.pages.inc
+++ b/tokenauth.pages.inc
@@ -31,32 +31,6 @@ function tokenauth_admin_settings() {
     '#description' => t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page. Read <a href=\"http://api.drupal.org/api/function/drupal_match_path/6\">drupal_match_path()</a> for the details.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '<front>')),
   );
 
-  $text = tokenauth_text_load();
-  $form['tokenauth_text'] = array(
-    '#type' => 'text_format',
-    '#title' => t('User text'),
-    '#description' => t('This text will be displayed on a tab in each user\'s profile. Use it to explain what functionality Tokenauth provides your site.'),
-    '#default_value' => $text['value'],
-    '#format' => $text['format'],
-    '#rows' => 5,
-  );
-
-  if (module_exists('token')) {
-    $form['tokenauth_text']['token_help'] = array(
-      '#title' => t('Replacement tokens'),
-      '#type' => 'fieldset',
-      '#collapsible' => TRUE,
-      '#collapsed' => TRUE,
-      '#weight' => 10,
-    );
-    $form['tokenauth_text']['token_help']['view'] = array(
-      '#theme' => 'token_tree',
-      '#token_types' => array('user'),
-      '#global_types' => TRUE,
-      '#click_insert' => TRUE,
-    );
-  }
-
   $form['tokenauth_advanced'] = array(
     '#type' => 'fieldset',
     '#title' => t('Token actions'),