diff --git a/user/view.php b/user/view.php
index 8eb58411d37..04b3f523dd4 100644
--- a/user/view.php
+++ b/user/view.php
@@ -209,7 +209,7 @@
         }
         $countries = get_list_of_countries();
         if (!empty($countries[$user->country]) && !isset($hiddenfields['country'])) {
-            if ($user->city && !isset($hiddenfields['country'])) {
+            if ($user->city && !isset($hiddenfields['city']) && !isset($hiddenfields['country'])) {
                 $location .= ', ';
             }
             $location .= $countries[$user->country];