diff --git a/account.php b/account.php
index 9601a351c5e02e5293c417fc485a9c6757d11ca0..47edb0c74145c2815b35d89793c4fb92fa82f784 100644
--- a/account.php
+++ b/account.php
@@ -272,7 +272,7 @@ function account_create_submit($userid, $email) {
 
     $link = path_uri() ."account.php?op=confirm&name=$new[userid]&hash=$new[hash]";
     $subject = strtr(t("Account details for %a"), array("%a" => variable_get(site_name, "drupal")));
-    $message = strtr(t("%a,\n\n\nsomeone signed up for a user account on %b and supplied this e-mail address as their contact.  If it wasn't you, don't get your panties in a knot and simply ignore this mail.  If this was you, you will have to confirm your account first or you will not be able to login.  To confirm your account visit the URL below:\n\n   %c\n\nOnce confirmed you can login using the following username and password:\n\n   username: %a\n   password: %d\n\n\n-- %b team\n"), array("%a" => $new[userid], "%b" => variable_get(site_name, "drupal"), "%c" => $link, "%d" => $new[passwd]));
+    $message = strtr(t("%a,\n\n\nsomeone signed up for a user account on %b and supplied this e-mail address as their contact.  If it wasn't you, don't get your panties in a bundle and simply ignore this mail.  If this was you, you will have to confirm your account first or you will not be able to login.  To confirm your account visit the URL below:\n\n   %c\n\nOnce confirmed you can login using the following username and password:\n\n   username: %a\n   password: %d\n\n\n-- %b team\n"), array("%a" => $new[userid], "%b" => variable_get(site_name, "drupal"), "%c" => $link, "%d" => $new[passwd]));
 
     watchdog("account", "new account: `$new[userid]' <$new[real_email]>");
 
diff --git a/includes/common.inc b/includes/common.inc
index 86c24c1b4541030f087fca86f9f002ecf9d13316..1bb337280fae8c44dd77e1a7246336106d1577ed 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -147,7 +147,7 @@ function format_date($timestamp, $type = "medium", $format = "") {
     case "custom":
       for ($i = strlen($format); $i >= 0; $c = $format[--$i]) {
         if (strstr("DFlMSw", $c)) {
-          $date=t(date($c, $timestamp)).$date;
+          $date = t(date($c, $timestamp)).$date;
         }
         else if (strstr("AaBdgGhHiIjLmnrstTUYyZz", $c)) {
           $date = date($c, $timestamp).$date;
@@ -164,7 +164,7 @@ function format_date($timestamp, $type = "medium", $format = "") {
 }
 
 function format_username($username) {
-  if ($username) return (user_access("administer accounts") ? "<A HREF=\"admin.php?mod=account&op=view&name=". urlencode($username) ."\">$username</A>" : "<A HREF=\"account.php?op=view&name=". urlencode($username) ."\">$username</A>");
+  if ($username) return (user_access("administer users") ? "<A HREF=\"admin.php?mod=account&op=view&name=". urlencode($username) ."\">$username</A>" : "<A HREF=\"account.php?op=view&name=". urlencode($username) ."\">$username</A>");
   else return variable_get(anonymous, "Anonymous");
 }
 
diff --git a/modules/poll.module b/modules/poll.module
index 2f388b803da57757d640b18844d2cead413588f4..17b17925c0385ec5e724b7553da0faf1f79acc47 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -101,7 +101,7 @@ function poll_graph($val) {
 
 function poll_view($node, $main = 0, $block = 0) {
   global $theme, $op, $user, $chid, $REQUEST_URI;
-  
+
   $pollop = $op;
 
   if (($node->active) && (!field_get($node->voters, $user->userid))) $voting = 1;
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 2f388b803da57757d640b18844d2cead413588f4..17b17925c0385ec5e724b7553da0faf1f79acc47 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -101,7 +101,7 @@ function poll_graph($val) {
 
 function poll_view($node, $main = 0, $block = 0) {
   global $theme, $op, $user, $chid, $REQUEST_URI;
-  
+
   $pollop = $op;
 
   if (($node->active) && (!field_get($node->voters, $user->userid))) $voting = 1;