diff --git a/user/edit.php b/user/edit.php
index 064fb308fdf..7bf8b327ec3 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -100,6 +100,10 @@
 
     //create form
     $userform = new user_edit_form();
+    if (empty($user->country)) {
+        // MDL-16308 - we must unset the value here so $CFG->country can be used as default one
+        unset($user->country);
+    }
     $userform->set_data($user);
 
     $email_changed = false;