diff --git a/b2-include/b2functions.php b/b2-include/b2functions.php
index ab41273a2d..23b3061011 100644
--- a/b2-include/b2functions.php
+++ b/b2-include/b2functions.php
@@ -1274,6 +1274,7 @@ function doGeoUrlHeader($posts) {
         if(($lon != null) && ($lat != null) ) {
             echo "<meta name=\"ICBM\" content=\"".$lat.", ".$lon."\" >\n";
             echo "<meta name=\"DC.title\" content=\"".convert_chars(strip_tags(get_bloginfo("name")),"unicode")." - ".$title."\">\n";
+            echo "<meta name=\"geo.position\" content=\"".$lat.";".$lon."\">\n";
             return;
         }
     } else {
@@ -1281,6 +1282,7 @@ function doGeoUrlHeader($posts) {
             // send the default here 
             echo "<meta name=\"ICBM\" content=\"".$default_geourl_lat.", ".$default_geourl_lon."\" >\n";
             echo "<meta name=\"DC.title\" content=\"".convert_chars(strip_tags(get_bloginfo("name")),"unicode")."\">\n";
+            echo "<meta name=\"geo.position\" content=\"".$default_geourl_lat.";".$default_geourl_lon."\">\n";
         }
     }
 }
diff --git a/wp-admin/wp-edit.form.php b/wp-admin/wp-edit.form.php
index 7fb808fad6..69205f6771 100644
--- a/wp-admin/wp-edit.form.php
+++ b/wp-admin/wp-edit.form.php
@@ -193,6 +193,12 @@ edCanvas = document.getElementById('content');
 <?php
 }
 if (get_settings('use_geo_positions')) {
+    if (empty($edited_lat)) {
+        if (get_settings('use_default_geourl')) {
+            $edited_lat = get_settings('default_geourl_lat');
+            $edited_lon = get_settings('default_geourl_lon');
+        }
+    }
 ?>
 <label for="post_latf">Latitude:</label><input size="8" type="text" value="<?php echo $edited_lat; ?>" name="post_latf">&nbsp;
 <label for="post_lonf">Longitude:</label><input size="8" type="text" value="<?php echo $edited_lon; ?>" name="post_lonf">&nbsp; <a href="http://www.geourl.org/resources.html" rel="external" >click for Geo Info</a>
diff --git a/wp-settings.php b/wp-settings.php
index 89ad999a26..a0143cba7a 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -51,6 +51,9 @@ if (!$_wp_installing) {
     $emailtestonly = get_settings('emailtestonly');
     $use_phoneemail = get_settings('use_phoneemail');
     $phoneemail_separator = get_settings('phoneemail_separator');
+    $use_default_geourl = get_settings('use_default_geourl');
+    $default_geourl_lat = get_settings('default_geourl_lat');
+    $default_geourl_lon = get_settings('default_geourl_lon');
 
     /* not currently used
     if (get_settings('search_engine_friendly_urls')) {