diff --git a/library/ajax/user_register.php b/library/ajax/user_register.php
index d5b48ec37..83e3cfaf5 100644
--- a/library/ajax/user_register.php
+++ b/library/ajax/user_register.php
@@ -47,6 +47,11 @@ switch ($mode) {
         }
         break;
 
+    case 'check_country':
+        $country = (string)$this->request['country'];
+        $html = render_flag($country);
+        break;
+
     default:
         $this->ajax_die('Invalid mode: ' . $mode);
 }
diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php
index 133989bf0..f955f5a8b 100644
--- a/library/includes/ucp/register.php
+++ b/library/includes/ucp/register.php
@@ -437,6 +437,7 @@ foreach ($profile_fields as $field => $can_edit) {
                 $pr_data['user_from'] = $from;
                 $db_data['user_from'] = (string)$from;
             }
+            $tp_data['COUNTRY_SELECTED'] = render_flag($pr_data['user_from']);
             $tp_data['COUNTRY_SELECT'] = build_select('user_from', array_flip($lang['COUNTRIES']), $pr_data['user_from']);
             break;
 
diff --git a/styles/templates/default/usercp_register.tpl b/styles/templates/default/usercp_register.tpl
index 56a6806b6..76ff25f4d 100644
--- a/styles/templates/default/usercp_register.tpl
+++ b/styles/templates/default/usercp_register.tpl
@@ -155,7 +155,16 @@
         </tr>
         <tr>
             <td class="prof-title">{L_LOCATION}:</td>
-            <td>{COUNTRY_SELECT}</td>
+            <td>{COUNTRY_SELECT}&nbsp;<span id="check_country">{COUNTRY_SELECTED}</td>
+            <script type="text/javascript">
+                $('#user_from').bind('change', function () {
+                    ajax.exec({
+                        action: 'user_register',
+                        mode: 'check_country',
+                        country: $(this).val()
+                    });
+                });
+            </script>
         </tr>
         <!-- ENDIF -->
         <!-- IF $bb_cfg['allow_change']['language'] -->