diff --git a/js/geolocation-geocoder.js b/js/geolocation-geocoder.js
index 2ebffa2..432fbb7 100644
--- a/js/geolocation-geocoder.js
+++ b/js/geolocation-geocoder.js
@@ -132,6 +132,35 @@
             lat: position.coords.latitude,
             lng: position.coords.longitude
           });
+                  Drupal.geolocation.geocoder.setMapMarker(new google.maps.LatLng(position.coords.latitude, position.coords.longitude), map);
+                  Drupal.geolocation.geocoderWidget.setHiddenInputFields(new google.maps.LatLng(position.coords.latitude, position.coords.longitude), map);
+
+                //Draw a circle representing the accuracy radius of HTML5 geolocation
+                var circle = new google.maps.Circle({
+                    center: {lat: position.coords.latitude,lng: position.coords.longitude},
+                    radius: position.coords.accuracy,
+                    map: map.googleMap,
+                    fillColor: '#4285F4',
+                    fillOpacity: 0.2,
+                    strokeColor: '#4285F4',
+                    strokeOpacity: 0.5,
+                    clickable:false,
+                });
+
+                //Set the zoom level to the accuracy circle's size
+                map.googleMap.fitBounds(circle.getBounds());
+
+                //Delete the accuracy circle when the marker is moved elsewhere
+                 google.maps.event.addListener(map.googleMap, 'click', function(e){
+                    circle.setMap(null);
+                });
+                //Delete the accuracy circle when the marker is moved within the circle
+                 google.maps.event.addListener(circle, 'click', function(e){
+                    circle.setMap(null);
+                });
+                 google.maps.event.addDomListener($(map.controls).children('button.clear')[0], 'click', function (e) {
+                    circle.setMap(null);
+                });
         });
       });
     }
diff --git a/js/geolocation-widget-googlegeocoder.js b/js/geolocation-widget-googlegeocoder.js
index 35ac84f..59b272b 100644
--- a/js/geolocation-widget-googlegeocoder.js
+++ b/js/geolocation-widget-googlegeocoder.js
@@ -89,6 +89,34 @@
               if (typeof (drupalSettings.geolocation.widgetSettings[widget_id].autoClientLocationMarker) != 'undefined') {
                 if (drupalSettings.geolocation.widgetSettings[widget_id].autoClientLocationMarker) {
                   Drupal.geolocation.geocoder.setMapMarker(new google.maps.LatLng(position.coords.latitude, position.coords.longitude), map);
+                  Drupal.geolocation.geocoderWidget.setHiddenInputFields(new google.maps.LatLng(position.coords.latitude, position.coords.longitude), map);
+
+                //Draw a circle representing the accuracy radius of HTML5 geolocation
+                var circle = new google.maps.Circle({
+                    center: {lat: position.coords.latitude,lng: position.coords.longitude},
+                    radius: position.coords.accuracy,
+                    map: map.googleMap,
+                    fillColor: '#4285F4',
+                    fillOpacity: 0.2,
+                    strokeColor: '#4285F4',
+                    strokeOpacity: 0.5,
+                    clickable:false,
+                });
+
+                //Set the zoom level to the accuracy circle's size
+                map.googleMap.fitBounds(circle.getBounds());
+
+                //Delete the accuracy circle when the marker is moved elsewhere
+                 google.maps.event.addListener(map.googleMap, 'click', function(e){
+                    circle.setMap(null);
+                });
+                //Delete the accuracy circle when the marker is moved within the circle
+                 google.maps.event.addListener(circle, 'click', function(e){
+                    circle.setMap(null);
+                });
+                 google.maps.event.addDomListener($(map.controls).children('button.clear')[0], 'click', function (e) {
+                    circle.setMap(null);
+                });
                 }
               }
             });