diff --git a/modules/user.module b/modules/user.module
index 233da2b96f30f6cf98c167764516336deef9e21c..4ca8af7b7d1d65e5c3a632174cdd6b9bd4b89306 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -328,6 +328,15 @@ function user_block($op = "list", $delta = 0) {
     switch ($delta) {
       case 0:
         if (!$user->uid) {
+          /*
+          ** For usability's sake, avoid showing two login forms on one
+          ** page.
+          */
+
+          if (arg(0) == "user" && arg(1) != "view") {
+            return;
+          }
+
           $output = "<div class=\"user-login-block\">\n";
 
           /*
diff --git a/modules/user/user.module b/modules/user/user.module
index 233da2b96f30f6cf98c167764516336deef9e21c..4ca8af7b7d1d65e5c3a632174cdd6b9bd4b89306 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -328,6 +328,15 @@ function user_block($op = "list", $delta = 0) {
     switch ($delta) {
       case 0:
         if (!$user->uid) {
+          /*
+          ** For usability's sake, avoid showing two login forms on one
+          ** page.
+          */
+
+          if (arg(0) == "user" && arg(1) != "view") {
+            return;
+          }
+
           $output = "<div class=\"user-login-block\">\n";
 
           /*