diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 437416c..68d3966 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -732,8 +732,8 @@ function user_block_view($delta = '') {
         unset($form['pass']['#description']);
         $form['name']['#size'] = 15;
         $form['pass']['#size'] = 15;
-        if($form['#form_id'] == 'user_login_form'){
-          $form['#action'] = current_path();
+        if($form['#form_id'] == 'user_login_form' && $form['#action'] == '/'){
+          $form['#action'] = '/' . current_path();
         }else{
           $form['#action'] = url(current_path(), array('query' => drupal_get_destination(), 'external' => FALSE));
         }