diff --git a/src/components/UserMap.js b/src/components/UserMap.js
index 1a283939de70e157ce48cf0d977292ed5bb27fcd..69ad8d872814a132877e8d1c2cefd167c15bf6b2 100644
--- a/src/components/UserMap.js
+++ b/src/components/UserMap.js
@@ -12,27 +12,33 @@ class UserMap extends Component {
 
   componentDidMount(){
     this.getCurrentPosition((position) => {
-      if(position != null){
-        this.setState({
-          ownLat: position.lat,
-          ownLng: position.lng,
-        });
-      }
+      this.setState({
+        ownLat: position.coords.latitude,
+        ownLng: position.coords.longitude,
+      });
     });
   }
 
   getCurrentPosition(callback){
     if(!navigator.geolocation){
       console.log("Can't get geolocation :/");
-      callback(null);
     }
     else{
-      navigator.geolocation.getCurrentPosition((position)=> {
-        callback({
-          lat: position.coords.latitude,
-          lng: position.coords.longitude
-        });
-      });
+      // Position tracking options
+      const options = {
+        enableHighAccuracy: true,
+        timeout: 30000,
+        maximumAge: 0
+      }
+
+      navigator.geolocation.getCurrentPosition((position) =>{
+        //success
+        if(position != null){
+          callback(position);
+        }
+      }, (error) =>{
+        console.log(error);
+      }, options);
     }
   }
 
@@ -48,10 +54,14 @@ class UserMap extends Component {
             Se on perjantai, my dudes <br />
           </Popup>
         </Marker>
-        {this.state.ownLat !== null && <Marker position={[this.state.ownLat, this.state.ownLng]}></Marker>}
+        {this.state.ownLat !== null && <Marker position={[this.state.ownLat, this.state.ownLng]}>
+        <Popup>
+            User's real position.<br />
+          </Popup>
+        </Marker>}
       </Map>
     );
   }
 }
 
-export default UserMap;
+export default UserMap;
\ No newline at end of file