diff --git a/account.php b/account.php
index 316bd1f8348e4aa1b9a7f48ac68146a0ee8c0c0a..451800b56bb4dc926b17f5b24570548a718ca069 100644
--- a/account.php
+++ b/account.php
@@ -333,16 +333,16 @@ function account_create_submit($edit) {
       $theme->box(t("Create user account"), account_create_form($edit, $error));
     }
     else if ($ban = user_ban($edit[login], "username")) {
-      $theme->box(t("Create user account"), account_create_form($edit, t("the username '$edit[login]' is banned") .": <i>$ban->reason</i>."));
+      $theme->box(t("Create user account"), account_create_form($edit, strtr(t("the username '%a' is banned"), array("%a" => $edit[login])) .": <i>$ban->reason</i>."));
     }
     else if ($ban = user_ban($edit[real_email], "e-mail address")) {
-      $theme->box(t("Create user account"), account_create_form($edit, t("the username '$edit[email]' is banned") .": <i>$ban->reason</i>."));
+      $theme->box(t("Create user account"), account_create_form($edit, strtr(t("the e-mail '%a' is banned"), array("%a" => $edit[email])) .": <i>$ban->reason</i>."));
     }
     else if (db_num_rows(db_query("SELECT userid FROM users WHERE (LOWER(userid) = LOWER('$edit[login]') OR LOWER(name) = LOWER('$edit[login]'))")) > 0) {
-      $theme->box(t("Create user account"), account_create_form($edit, t("the username '$edit[login]' is already taken.")));
+      $theme->box(t("Create user account"), account_create_form($edit, strtr(t("the username '%a' is already taken."), array("%a" => $edit[login]))));
     }
     else if (db_num_rows(db_query("SELECT real_email FROM users WHERE LOWER(real_email) = LOWER('$edit[email]')")) > 0) {
-      $theme->box(t("Create user account"), account_create_form($edit, t("the e-mail address '$edit[email]' is already in use by another account.")));
+      $theme->box(t("Create user account"), account_create_form($edit, strtr(t("the e-mail address '%a' is already in use by another account."),array("%a" => $edit[email]))));
     }
     else {
 
@@ -517,7 +517,12 @@ function account_track_site() {
     break;
   case "login":
     account_session_start(check_input($userid), check_input($passwd));
-    header("Location: account.php?op=info");
+    if($HTTP_REFERER <> "") { 
+      header("Location: $HTTP_REFERER");
+    }
+    else { 
+      header("Location: account.php?op=info"); 
+    }
     break;
   case "logout":
     account_session_close();
diff --git a/index.php b/index.php
index 63538dec7e09e359e548b679c1eeab821c5f6517..46f9b36632d3ecb76d571103b569f5e8d9281ebc 100644
--- a/index.php
+++ b/index.php
@@ -14,7 +14,7 @@
   }
 }
 else {
-  $theme->box("Access denied", message_access());
+  $theme->box(t("Access denied"), message_access());
 }
 
 $theme->footer();
diff --git a/modules/search.module b/modules/search.module
index 7beb1e74c26525496ad5567c05e0db7f32e863f6..bb74db3c2e1aa3081224ac796fb9fd5ea6f6aee0 100644
--- a/modules/search.module
+++ b/modules/search.module
@@ -6,7 +6,7 @@ function search_perm() {
 
 function search_link($type) {
   if ($type == "page" && user_access("search content")) {
-    $links[] = "<a href=\"module.php?mod=search\">search</a>";
+    $links[] = "<a href=\"module.php?mod=search\">". t("search") ."</a>";
   }
 
   return $links ? $links : array();
@@ -49,7 +49,7 @@ function search_page() {
   }
   else {
     $theme->header();
-    $theme->box("Access denied", message_access());
+    $theme->box(t("Access denied"), message_access());
     $theme->footer();
   }
 }
diff --git a/submit.php b/submit.php
index 8181a0cfe2fbcc759e9e02917256549f4a10c801..8741c0b320eafae65e17d05342d982ef8aee2863 100644
--- a/submit.php
+++ b/submit.php
@@ -24,7 +24,7 @@
   }
 }
 else {
-  $theme->box("Submit", message_access());
+  $theme->box(t("Submit"), message_access());
 }
 
 $theme->footer();