diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/maps/MapActivity.java b/codec2talkie/src/main/java/com/radio/codec2talkie/maps/MapActivity.java
index 69b8765..798c2e3 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/maps/MapActivity.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/maps/MapActivity.java
@@ -13,7 +13,9 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceManager;
 
+import com.radio.codec2talkie.BuildConfig;
 import com.radio.codec2talkie.R;
+import com.radio.codec2talkie.protocol.Aprs;
 import com.radio.codec2talkie.protocol.aprs.tools.AprsSymbolTable;
 import com.radio.codec2talkie.settings.PreferenceKeys;
 
@@ -30,6 +32,9 @@ import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay;
 public class MapActivity extends AppCompatActivity {
     private static final String TAG = MapActivity.class.getSimpleName();
 
+    private static final double MAP_STARTUP_ZOOM = 5.0;
+    private static final double MAP_FOLLOW_ZOOM = 14.0;
+
     private MapView _mapView;
     private IMapController _mapController;
     private MyLocationNewOverlay _myLocationNewOverlay;
@@ -47,7 +52,7 @@ public class MapActivity extends AppCompatActivity {
         if (actionBar != null) actionBar.setDisplayHomeAsUpEnabled(true);
 
         Context context = getApplicationContext();
-        Configuration.getInstance().setUserAgentValue("C2T");
+        Configuration.getInstance().setUserAgentValue(Aprs.APRS_ID + " " + BuildConfig.VERSION_NAME);
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
 
         // my symbol
@@ -61,7 +66,7 @@ public class MapActivity extends AppCompatActivity {
 
         // controller
         _mapController = _mapView.getController();
-        _mapController.zoomTo(5.0);
+        _mapController.zoomTo(MAP_STARTUP_ZOOM);
 
         // compass
         InternalCompassOrientationProvider compassOrientationProvider = new InternalCompassOrientationProvider(context) {
@@ -149,7 +154,18 @@ public class MapActivity extends AppCompatActivity {
             }
             _mapStations.showMovingStations(showMoving);
             return true;
+        } else if (itemId == R.id.map_menu_move_map) {
+            if (item.isChecked()) {
+                item.setChecked(false);
+                _myLocationNewOverlay.disableFollowLocation();
+            } else {
+                item.setChecked(true);
+                _myLocationNewOverlay.enableFollowLocation();
+                _mapController.zoomTo(MAP_FOLLOW_ZOOM);
+            }
+            return true;
         }
+
         return super.onOptionsItemSelected(item);
     }
 }
diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AprsIs.java b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AprsIs.java
index 0676d45..a4934c3 100644
--- a/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AprsIs.java
+++ b/codec2talkie/src/main/java/com/radio/codec2talkie/protocol/AprsIs.java
@@ -312,7 +312,7 @@ public class AprsIs implements Protocol, Runnable {
     }
 
     private String getLoginCommand() {
-        String cmd = "user " + new AX25Callsign(_callsign, _ssid).toString() + " pass " + _passcode + " vers " + "C2T " + BuildConfig.VERSION_NAME;
+        String cmd = "user " + new AX25Callsign(_callsign, _ssid).toString() + " pass " + _passcode + " vers " + Aprs.APRS_ID + " " + BuildConfig.VERSION_NAME;
         if (_filterRadius > 0) {
             cmd += " filter m/" + _filterRadius;
         }
diff --git a/codec2talkie/src/main/res/menu/map_menu.xml b/codec2talkie/src/main/res/menu/map_menu.xml
index ac2037a..7bc0241 100644
--- a/codec2talkie/src/main/res/menu/map_menu.xml
+++ b/codec2talkie/src/main/res/menu/map_menu.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/map_menu_move_map"
+        android:title="@string/map_menu_move_map"
+        android:checkable="true"
+        android:checked="false"/>
     <item
         android:id="@+id/map_menu_rotate_map"
         android:title="@string/map_menu_rotate_map"
diff --git a/codec2talkie/src/main/res/values/strings.xml b/codec2talkie/src/main/res/values/strings.xml
index 9059b2b..5bcaca3 100644
--- a/codec2talkie/src/main/res/values/strings.xml
+++ b/codec2talkie/src/main/res/values/strings.xml
@@ -369,4 +369,5 @@
     <string name="map_menu_show_moving">Show moving stations</string>
     <string name="aprs_text_packets_enable_title">Enable text packets</string>
     <string name="aprs_text_packets_enable_summary">Send lora aprs compatible text packets (0x3c,0xff,0x01 prefix)</string>
+    <string name="map_menu_move_map">Move map with own position</string>
 </resources>
\ No newline at end of file