diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DeviceConfigurationQRCodeUtils.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DeviceConfigurationQRCodeUtils.java
index 2ab10e792a2..217489daf6e 100644
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DeviceConfigurationQRCodeUtils.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/DeviceConfigurationQRCodeUtils.java
@@ -10,7 +10,7 @@ import com.sap.sse.common.Util;
  */
 public class DeviceConfigurationQRCodeUtils {
 
-    private static final String fragmentKey = "identifier";
+    public static final String fragmentKey = "identifier";
 
     public static String composeQRContent(String deviceIdentifier, String apkUrl) {
         // poor man's uri fragment encoding: ' ' as '%20'
diff --git a/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml b/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
index 2acfbe00537..332fb33f95d 100644
--- a/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
@@ -14,9 +14,9 @@
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.CAMERA"/>
+    <!--<uses-permission android:name="android.permission.CAMERA"/>-->
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <!--<uses-permission android:name="android.permission.RECORD_AUDIO"/>-->
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_normal.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_normal.xml
index c02324d31f3..b3949a73922 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_normal.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_normal.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -10,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        android:src="@drawable/backdrop"/>
+        android:src="@drawable/backdrop" />
 
     <ImageView
         android:id="@+id/imageView"
@@ -20,7 +19,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginLeft="@dimen/default_margin_half"
         android:layout_marginTop="@dimen/default_margin_twice"
-        android:src="@drawable/sap_logo"/>
+        android:src="@drawable/sap_logo" />
 
     <TextView
         android:id="@+id/backdrop_title"
@@ -34,7 +33,7 @@
         android:paddingTop="@dimen/default_padding"
         android:text="@string/login_text"
         android:textColor="@color/constant_white"
-        android:textSize="@dimen/textSize_40"/>
+        android:textSize="@dimen/textSize_40" />
 
     <LinearLayout
         android:id="@+id/button_bar"
@@ -49,21 +48,21 @@
         tools:alpha="1">
 
         <ImageView
-            style="?attr/round"
             android:id="@+id/more"
+            style="?attr/round"
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_marginRight="@dimen/default_margin_half"
-            android:src="@drawable/ic_more_vert_white_48dp"/>
+            android:src="@drawable/ic_more_vert_white_48dp" />
     </LinearLayout>
 
     <TextView
-        android:id="@+id/backdrop_subtitle"
+        android:id="@+id/backdrop_login"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:alpha="0"
         android:layout_toLeftOf="@id/button_bar"
+        android:alpha="0"
         android:drawableLeft="@drawable/ic_assignment_white_48dp"
         android:drawablePadding="@dimen/default_padding_half"
         android:gravity="center_vertical"
@@ -73,12 +72,30 @@
         android:paddingTop="@dimen/default_padding"
         android:text="@string/login_sub_text"
         android:textColor="@color/constant_white"
-        android:textSize="@dimen/textSize_40"/>
+        android:textSize="@dimen/textSize_40" />
+
+    <TextView
+        android:id="@+id/backdrop_onboarding"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_toLeftOf="@id/button_bar"
+        android:alpha="0"
+        android:drawableLeft="@drawable/ic_assignment_white_48dp"
+        android:drawablePadding="@dimen/default_padding_half"
+        android:gravity="center_vertical"
+        android:paddingBottom="@dimen/default_padding_half"
+        android:paddingLeft="@dimen/default_padding_half"
+        android:paddingRight="@dimen/default_padding_half"
+        android:paddingTop="@dimen/default_padding"
+        android:text="@string/login_onboarding_text"
+        android:textColor="@color/constant_white"
+        android:textSize="@dimen/textSize_40" />
 
     <View
         android:id="@+id/line"
         android:layout_width="match_parent"
         android:layout_height="2dp"
         android:layout_alignParentBottom="true"
-        android:background="?attr/sap_yellow_1"/>
+        android:background="?attr/sap_yellow_1" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_xlarge.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_xlarge.xml
index 992a86a970e..80c270aae47 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_xlarge.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_backdrop_xlarge.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -10,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        android:src="@drawable/backdrop"/>
+        android:src="@drawable/backdrop" />
 
     <ImageView
         android:id="@+id/imageView"
@@ -20,7 +19,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginLeft="@dimen/default_margin"
         android:layout_marginTop="@dimen/default_margin"
-        android:src="@drawable/sap_logo"/>
+        android:src="@drawable/sap_logo" />
 
     <TextView
         android:id="@+id/backdrop_title"
@@ -31,7 +30,7 @@
         android:padding="@dimen/default_padding"
         android:text="@string/login_text"
         android:textColor="@color/constant_white"
-        android:textSize="@dimen/textSize_40"/>
+        android:textSize="@dimen/textSize_40" />
 
     <LinearLayout
         android:id="@id/button_bar"
@@ -51,7 +50,7 @@
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_marginRight="@dimen/default_margin_half"
-            android:src="@drawable/ic_settings_white_48dp"/>
+            android:src="@drawable/ic_settings_white_48dp" />
 
         <ImageView
             android:id="@+id/technical_info"
@@ -59,7 +58,7 @@
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_marginRight="@dimen/default_margin_half"
-            android:src="@drawable/ic_info_outline_white_48dp"/>
+            android:src="@drawable/ic_info_outline_white_48dp" />
 
         <ImageView
             android:id="@+id/refresh_data"
@@ -67,11 +66,11 @@
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_marginRight="@dimen/default_margin_half"
-            android:src="@drawable/ic_refresh_white_48dp"/>
+            android:src="@drawable/ic_refresh_white_48dp" />
     </LinearLayout>
 
     <TextView
-        android:id="@+id/backdrop_subtitle"
+        android:id="@+id/backdrop_login"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
@@ -83,12 +82,27 @@
         android:padding="@dimen/default_padding"
         android:text="@string/login_sub_text"
         android:textColor="@color/constant_white"
-        android:textSize="@dimen/textSize_40"/>
+        android:textSize="@dimen/textSize_40" />
+
+    <TextView
+        android:id="@+id/backdrop_onboarding"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_toLeftOf="@id/button_bar"
+        android:alpha="0"
+        android:drawableLeft="@drawable/ic_assignment_white_48dp"
+        android:drawablePadding="@dimen/default_padding_half"
+        android:gravity="center_vertical"
+        android:padding="@dimen/default_padding"
+        android:text="@string/login_onboarding_text"
+        android:textColor="@color/constant_white"
+        android:textSize="@dimen/textSize_40" />
 
     <View
         android:id="@+id/line"
         android:layout_width="match_parent"
         android:layout_height="2dp"
         android:layout_alignParentBottom="true"
-        android:background="?attr/sap_yellow_1"/>
+        android:background="?attr/sap_yellow_1" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding.xml
new file mode 100644
index 00000000000..c1dc814abf4
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/sap_gray">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/scanQr"
+            layout="@layout/login_onboarding_scan" />
+
+        <include
+            android:id="@+id/manual_input"
+            layout="@layout/login_onboarding_input" />
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_edit.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_edit.xml
new file mode 100644
index 00000000000..3ecb52b4392
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_edit.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="@dimen/side_padding">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/settings_advanced_service_header"
+        android:textColor="@color/black"
+        android:textSize="@dimen/textSize_22" />
+
+    <EditText
+        android:id="@+id/url"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textUri"
+        android:selectAllOnFocus="true"
+        android:text="@string/preference_server_url_default"
+        android:textColor="@color/black" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/side_padding"
+        android:text="@string/device_identifier"
+        android:textColor="@color/black"
+        android:textSize="@dimen/textSize_22" />
+
+    <EditText
+        android:id="@+id/device_id"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textNoSuggestions"
+        android:selectAllOnFocus="true"
+        android:textColor="@color/black" />
+</LinearLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_input_normal.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_input_normal.xml
new file mode 100644
index 00000000000..f7fc769e37c
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_input_normal.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="?attr/button"
+    android:layout_width="@dimen/default_button_width"
+    android:layout_height="@dimen/default_button_height"
+    android:layout_alignParentBottom="true"
+    android:layout_centerHorizontal="true"
+    android:layout_marginBottom="@dimen/default_margin"
+    android:text="@string/onboarding_input"
+    android:textSize="@dimen/textSize_18"
+    tools:showIn="@layout/login_listviews" />
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_input_xlarge.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_input_xlarge.xml
new file mode 100644
index 00000000000..9a7e775e692
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_input_xlarge.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="?attr/buttonSolidNormal"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_marginBottom="@dimen/default_margin"
+    android:text="@string/onboarding_input"
+    android:textSize="@dimen/textSize_26"
+    tools:showIn="@layout/login_listviews" />
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_scan_normal.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_scan_normal.xml
new file mode 100644
index 00000000000..3856e077065
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_scan_normal.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="?attr/button"
+    android:layout_width="@dimen/default_button_width"
+    android:layout_height="@dimen/default_button_height"
+    android:layout_alignParentBottom="true"
+    android:layout_centerHorizontal="true"
+    android:layout_marginBottom="@dimen/default_margin"
+    android:text="@string/onboarding_scan"
+    android:textSize="@dimen/textSize_18"
+    tools:showIn="@layout/login_listviews" />
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_scan_xlarge.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_scan_xlarge.xml
new file mode 100644
index 00000000000..bc9017f6a44
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_onboarding_scan_xlarge.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="?attr/buttonSolidNormal"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_marginBottom="@dimen/default_margin"
+    android:text="@string/onboarding_scan"
+    android:textSize="@dimen/textSize_26"
+    tools:showIn="@layout/login_listviews" />
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_view.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_view.xml
index 6d883f894be..4040b5df015 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/login_view.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/login_view.xml
@@ -17,9 +17,15 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_gravity="center_horizontal|bottom"
-        android:background="?attr/sap_gray_black_30"
         tools:layout="@layout/login_listviews"/>
 
+    <FrameLayout
+        android:id="@+id/login_onboarding"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_gravity="center_horizontal|bottom"
+        tools:layout="@layout/login_onboarding"/>
+
     <RelativeLayout
         android:id="@+id/progress_spinner"
         android:layout_width="match_parent"
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
index dfc1061a463..37b89f9c1a6 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
@@ -269,8 +269,9 @@
     <string name="course">Kurs</string>
     <string name="confirm_start_time">Startzeit Bestätigen</string>
     <string name="confirm_start_mode">Startmodus Bestätigen</string>
-    <string name="login_sub_text">Bitte wählen Sie eine Regatta aus</string>
     <string name="login_text">Willkommen beim\nSAP Sailing Race Manager</string>
+    <string name="login_sub_text">Bitte wählen Sie eine Regatta aus</string>
+    <string name="login_onboarding_text">Onboarding</string>
     <string name="nav_drawer_close">Navigation-Drawer schließen</string>
     <string name="nav_drawer_open">Navigation-Drawer öffnen</string>
     <string name="sign_up">Anmelden</string>
@@ -391,8 +392,8 @@
     <string name="use_previous_course_dialog_message">Soll das bisherige Kursdesign verwendet werden?</string>
     <string name="please_enter_valid_number">Bitte geben Sie eine gültige Zahl ein.</string>
     <string name="please_enter_valid_pathfinder">Bitte tragen Sie einen gültigen Pathfinder ein.</string>
-    <string name="error_scanning_qr">Fehler beim Scannen des QRCodes(%s)</string>
-    <string name="error_scanning_qr_malformed">Fehler beim Scannen des QRCodes(Ungültige Url)</string>
+    <string name="error_scanning_qr">Fehler beim Scannen des QRCodes (%s)</string>
+    <string name="error_scanning_qr_malformed">Ungültige Url</string>
     <string name="marks_w_placeholder">Kursmarkierungen: %s</string>
     <string name="error_no_course_to_copy">Kein Kurs zum Kopieren vorhanden</string>
     <string name="error_missing_second_mark">Die gewählten Anweisungen zum Vorbeifahren benötigen zwei Bojen. Bitte Wählen Sie eine zweite Boje.</string>
@@ -456,5 +457,7 @@
     <string name="reset_state_2">Zurücksetzen</string>
     <string name="reset_message_1">Soll die Liste komplett gelöscht werden?</string>
     <string name="reset_message_2">Soll die Liste zum letzten bekannten Stand zurückgesetzt werden?</string>
+    <string name="onboarding_scan">Scan QR-Code</string>
+    <string name="onboarding_input">Manuelle Eingabe</string>
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
index c63fad1e780..03249a3a0ac 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-sw720dp/references.xml
@@ -7,6 +7,8 @@
     <item name="flag_list_item" type="layout">@layout/flag_list_item_xlarge</item>
     <item name="login_backdrop" type="layout">@layout/login_backdrop_xlarge</item>
     <item name="login_listviews_button" type="layout">@layout/login_listviews_button_xlarge</item>
+    <item name="login_onboarding_scan" type="layout">@layout/login_onboarding_scan_xlarge</item>
+    <item name="login_onboarding_input" type="layout">@layout/login_onboarding_input_xlarge</item>
     <item name="photo_list_button" type="layout">@layout/photo_list_button_xlarge</item>
     <item name="photo_list_item" type="layout">@layout/photo_list_item_xlarge</item>
     <item name="race_finishing_button" type="layout">@layout/race_finishing_button_xlarge</item>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
index 1ba516f71dd..d30f9e1ba6f 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/references.xml
@@ -8,6 +8,8 @@
     <item name="flag_list_item" type="layout">@layout/flag_list_item_normal</item>
     <item name="login_backdrop" type="layout">@layout/login_backdrop_normal</item>
     <item name="login_listviews_button" type="layout">@layout/login_listviews_button_normal</item>
+    <item name="login_onboarding_scan" type="layout">@layout/login_onboarding_scan_normal</item>
+    <item name="login_onboarding_input" type="layout">@layout/login_onboarding_input_normal</item>
     <item name="photo_list_button" type="layout">@layout/photo_list_button_normal</item>
     <item name="photo_list_item" type="layout">@layout/photo_list_item_normal</item>
     <item name="race_finished" type="layout">@layout/race_finished_normal</item>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
index 0e4bca438cd..168518c0dd2 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
@@ -296,6 +296,7 @@
 
     <string name="login_text">Welcome to\nSAP Sailing Race Manager</string>
     <string name="login_sub_text">Please select a regatta</string>
+    <string name="login_onboarding_text">Onboarding</string>
     <string name="sign_up">Sign Me Up</string>
     <string name="wind_display">dd</string>
     <string name="flags_abandon">Abandon</string>
@@ -414,8 +415,8 @@
     <string name="use_previous_course_dialog_message">Use previously published course design?</string>
     <string name="please_enter_valid_number">Please enter a valid number</string>
     <string name="please_enter_valid_pathfinder">Please enter a valid pathfinder</string>
-    <string name="error_scanning_qr">Error scanning QRCode(%s)</string>
-    <string name="error_scanning_qr_malformed">Error scanning QRCode(malformed url)</string>
+    <string name="error_scanning_qr">Error scanning QRCode (%s)</string>
+    <string name="error_scanning_qr_malformed">Malformed url</string>
     <string name="marks_w_placeholder">Marks: %s</string>
     <string name="error_no_course_to_copy">No course available to copy</string>
     <string name="error_missing_second_mark">The selected passing instructions require two buoys. Please select the second buoy.</string>
@@ -483,5 +484,7 @@
     <string name="reset_message_1">Do you want to clear the list?</string>
     <string name="reset_message_2">Do you want to reset to the last state?</string>
     <string name="geo_coords" translatable="false">%1$d° %2$d′ %3$.3f″</string>
+    <string name="onboarding_scan">Scan QR-Code</string>
+    <string name="onboarding_input">Manual Input</string>
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_general.xml b/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_general.xml
index 49e16616365..0d1f96bf120 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_general.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_general.xml
@@ -11,7 +11,6 @@
             android:key="@string/preference_identifier_key"
             android:title="@string/device_identifier"/>
         <com.sap.sailing.racecommittee.app.ui.views.UrlEditTextPreference
-            android:defaultValue="@string/preference_server_url_default"
             android:key="@string/preference_server_url_key"
             android:title="@string/settings_advanced_service_header"/>
         <Preference
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
index eaffcc1ad9a..b72b0f2b4a3 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
@@ -250,12 +250,7 @@ public class AppPreferences {
     }
 
     public String getServerBaseURL() {
-        String value = preferences.getString(key(R.string.preference_server_url_key), "");
-        if (value.equals("")) {
-            return "http://localhost:8889";
-        }
-
-        return value;
+        return preferences.getString(key(R.string.preference_server_url_key), null);
     }
 
     public double getWindBearingFromDirection() {
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
index df48b0091df..37c0403a88b 100755
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
@@ -21,6 +21,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.Nullable;
 import android.support.v4.content.LocalBroadcastManager;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AccelerateDecelerateInterpolator;
@@ -52,6 +53,7 @@ import com.sap.sailing.racecommittee.app.domain.LoginType;
 import com.sap.sailing.racecommittee.app.domain.configuration.impl.PreferencesDeviceConfigurationLoader;
 import com.sap.sailing.racecommittee.app.logging.LogEvent;
 import com.sap.sailing.racecommittee.app.ui.fragments.LoginListViews;
+import com.sap.sailing.racecommittee.app.ui.fragments.LoginOnboarding;
 import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.AttachedDialogFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.DialogListenerHost;
 import com.sap.sailing.racecommittee.app.ui.fragments.lists.CourseAreaListFragment;
@@ -65,7 +67,7 @@ import com.sap.sailing.racecommittee.app.utils.StringHelper;
 import com.sap.sailing.racecommittee.app.utils.autoupdate.AutoUpdater;
 
 public class LoginActivity extends BaseActivity
-    implements EventSelectedListenerHost, CourseAreaSelectedListenerHost, PositionSelectedListenerHost, DialogListenerHost.DialogResultListener {
+        implements EventSelectedListenerHost, CourseAreaSelectedListenerHost, PositionSelectedListenerHost, DialogListenerHost.DialogResultListener {
 
     private final static String CourseAreaListFragmentTag = "CourseAreaListFragmentTag";
     private final static String AreaPositionListFragmentTag = "AreaPositionListFragmentTag";
@@ -307,7 +309,9 @@ public class LoginActivity extends BaseActivity
         // setup the login list views fragment
         loginListViews = new LoginListViews();
         FragmentTransaction transaction = getFragmentManager().beginTransaction();
-        transaction.replace(R.id.login_listview, loginListViews).commitAllowingStateLoss();
+        transaction.replace(R.id.login_listview, loginListViews);
+        transaction.replace(R.id.login_onboarding, new LoginOnboarding());
+        transaction.commitAllowingStateLoss();
 
         new AutoUpdater(this).notifyAfterUpdate();
 
@@ -350,7 +354,11 @@ public class LoginActivity extends BaseActivity
         filter.addAction(AppConstants.INTENT_ACTION_RESET);
         LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, filter);
 
-        resetData();
+        if (!TextUtils.isEmpty(AppPreferences.on(this).getServerBaseURL())) {
+            resetData();
+        } else {
+            slideUpBackdropDelayed();
+        }
 
         int resultCode = GooglePlayServicesUtil.isGooglePlayServicesAvailable(getApplicationContext());
 
@@ -378,7 +386,7 @@ public class LoginActivity extends BaseActivity
         showProgressSpinner();
 
         DeviceConfigurationIdentifier identifier = new DeviceConfigurationIdentifierImpl(AppPreferences.on(getApplicationContext())
-            .getDeviceIdentifier());
+                .getDeviceIdentifier());
 
         LoaderCallbacks<?> configurationLoader = dataManager.createConfigurationLoader(identifier, new LoadClient<DeviceConfiguration>() {
 
@@ -454,13 +462,29 @@ public class LoginActivity extends BaseActivity
     }
 
     private void slideUpBackdrop() {
+        final View loginView = findViewById(R.id.login_listview);
+        loginView.setVisibility(View.GONE);
+        final View onboardingView = findViewById(R.id.login_onboarding);
+        onboardingView.setVisibility(View.GONE);
+
+        ViewHelper.get(backdrop, R.id.backdrop_login).setVisibility(View.GONE);
+        ViewHelper.get(backdrop, R.id.backdrop_onboarding).setVisibility(View.GONE);
+
+        if (TextUtils.isEmpty(AppPreferences.on(this).getServerBaseURL())) {
+            onboardingView.setVisibility(View.VISIBLE);
+            ViewHelper.get(backdrop, R.id.backdrop_onboarding).setVisibility(View.VISIBLE);
+        } else {
+            loginView.setVisibility(View.VISIBLE);
+            ViewHelper.get(backdrop, R.id.backdrop_login).setVisibility(View.VISIBLE);
+        }
+
         // don't slide up if already up
         if (backdrop.getY() != 0) {
             return;
         }
 
         int upperRoom = backdrop.getHeight() + (backdrop.getHeight() / 5);
-        View subTitle = ViewHelper.get(backdrop, R.id.backdrop_subtitle);
+        View subTitle = ViewHelper.get(backdrop, R.id.backdrop_login);
         if (subTitle != null) {
             upperRoom = backdrop.getHeight() - subTitle.getHeight() - getResources().getDimensionPixelSize(R.dimen.default_padding_half);
         }
@@ -469,11 +493,14 @@ public class LoginActivity extends BaseActivity
         heightAnimation.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
             @Override
             public void onAnimationUpdate(ValueAnimator valueAnimator) {
-                View bottomView = findViewById(R.id.login_listview);
                 int val = (Integer) valueAnimator.getAnimatedValue();
-                ViewGroup.LayoutParams layoutParams = bottomView.getLayoutParams();
-                layoutParams.height = val;
-                bottomView.setLayoutParams(layoutParams);
+                ViewGroup.LayoutParams lpLogin = loginView.getLayoutParams();
+                lpLogin.height = val;
+                loginView.setLayoutParams(lpLogin);
+
+                ViewGroup.LayoutParams lpOnboarding = onboardingView.getLayoutParams();
+                lpOnboarding.height = val;
+                onboardingView.setLayoutParams(lpOnboarding);
             }
         });
 
@@ -481,7 +508,8 @@ public class LoginActivity extends BaseActivity
         animators.add(heightAnimation);
         animators.add(frameAnimation);
         animators.add(getAlphaRevAnimator(findViewById(R.id.backdrop_title)));
-        animators.add(getAlphaAnimator(findViewById(R.id.backdrop_subtitle)));
+        animators.add(getAlphaAnimator(findViewById(R.id.backdrop_login)));
+        animators.add(getAlphaAnimator(findViewById(R.id.backdrop_onboarding)));
         animators.add(getAlphaAnimator(findViewById(R.id.button_bar)));
 
         AnimatorSet animatorSet = new AnimatorSet();
@@ -522,7 +550,11 @@ public class LoginActivity extends BaseActivity
 
         @Override
         public void onReceive(Context context, Intent intent) {
-            resetData();
+            String action = intent.getAction();
+
+            if (AppConstants.INTENT_ACTION_RESET.equals(action)) {
+                resetData();
+            }
         }
     }
 
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginOnboarding.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginOnboarding.java
new file mode 100644
index 00000000000..00c99746a82
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/LoginOnboarding.java
@@ -0,0 +1,133 @@
+package com.sap.sailing.racecommittee.app.ui.fragments;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.content.LocalBroadcastManager;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.sap.sailing.android.shared.util.ViewHelper;
+import com.sap.sailing.domain.common.impl.DeviceConfigurationQRCodeUtils;
+import com.sap.sailing.racecommittee.app.AppConstants;
+import com.sap.sailing.racecommittee.app.AppPreferences;
+import com.sap.sailing.racecommittee.app.R;
+import com.sap.sailing.racecommittee.app.utils.UrlHelper;
+import com.sap.sailing.racecommittee.app.utils.autoupdate.AutoUpdater;
+import com.sap.sse.common.Util;
+
+import java.net.URL;
+
+public class LoginOnboarding extends Fragment {
+
+    private static final int requestCodeQR = 45392;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View layout = inflater.inflate(R.layout.login_onboarding, container, false);
+
+        Button scan = ViewHelper.get(layout, R.id.scanQr);
+        if (scan != null) {
+            scan.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    try {
+                        Intent intent = new Intent("com.google.zxing.client.android.SCAN");
+                        intent.putExtra("SCAN_MODE", "QR_CODE_MODE");
+                        startActivityForResult(intent, requestCodeQR);
+                    } catch (Exception e) {
+                        Uri marketUri = Uri.parse("market://details?id=com.google.zxing.client.android");
+                        Intent marketIntent = new Intent(Intent.ACTION_VIEW, marketUri);
+                        startActivity(marketIntent);
+                    }
+                }
+            });
+        }
+
+        Button manual = ViewHelper.get(layout, R.id.manual_input);
+        if (manual != null) {
+            manual.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    View view = View.inflate(v.getContext(), R.layout.login_onboarding_edit, null);
+                    final EditText url = (EditText) view.findViewById(R.id.url);
+                    final EditText device_id = (EditText) view.findViewById(R.id.device_id);
+                    device_id.setText(AppPreferences.on(v.getContext()).getDeviceIdentifier());
+
+                    AlertDialog.Builder builder = new AlertDialog.Builder(v.getContext(), R.style.AppTheme_AlertDialog);
+                    builder.setView(view);
+                    builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            if (saveData(url.getText().toString() + "#" + DeviceConfigurationQRCodeUtils.fragmentKey + "=" + device_id.getText().toString())) {
+                                LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(new Intent(AppConstants.INTENT_ACTION_RESET));
+                            }
+                        }
+                    });
+                    builder.setNegativeButton(android.R.string.cancel, null);
+                    AlertDialog dialog = builder.show();
+
+                    dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+                }
+            });
+        }
+
+        return layout;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode != requestCodeQR) {
+            super.onActivityResult(requestCode, resultCode, data);
+            return;
+        }
+
+        switch (resultCode) {
+            case Activity.RESULT_CANCELED:
+                break;
+
+            case Activity.RESULT_OK:
+                saveData(data.getStringExtra("SCAN_RESULT"));
+                break;
+
+            default:
+                Toast.makeText(getActivity(), getString(R.string.error_scanning_qr, resultCode), Toast.LENGTH_LONG).show();
+        }
+    }
+
+    private boolean saveData(String content) {
+        try {
+            Util.Pair<String, String> connectionConfiguration = DeviceConfigurationQRCodeUtils.splitQRContent(content);
+
+            String identifier = connectionConfiguration.getA();
+            URL apkUrl = UrlHelper.tryConvertToURL(connectionConfiguration.getB());
+
+            if (apkUrl != null) {
+                String serverUrl = UrlHelper.getServerUrl(apkUrl);
+
+                SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+                preferences.edit().putString(getString(R.string.preference_identifier_key), identifier).commit();
+                preferences.edit().putString(getString(R.string.preference_server_url_key), serverUrl).commit();
+
+                new AutoUpdater(getActivity()).checkForUpdate(false);
+                return true;
+            } else {
+                Toast.makeText(getActivity(), getString(R.string.error_scanning_qr_malformed), Toast.LENGTH_LONG).show();
+            }
+        } catch (IllegalArgumentException e) {
+            Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_LONG).show();
+        }
+        return false;
+    }
+}
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
index 6ecd9721a2d..3436960e568 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
@@ -22,6 +22,7 @@ import com.sap.sailing.domain.common.impl.DeviceConfigurationQRCodeUtils;
 import com.sap.sailing.racecommittee.app.AppPreferences;
 import com.sap.sailing.racecommittee.app.BuildConfig;
 import com.sap.sailing.racecommittee.app.R;
+import com.sap.sailing.racecommittee.app.utils.UrlHelper;
 import com.sap.sailing.racecommittee.app.utils.autoupdate.AutoUpdater;
 import com.sap.sse.common.Util;
 
@@ -192,10 +193,10 @@ public class GeneralPreferenceFragment extends BasePreferenceFragment {
                 Util.Pair<String, String> connectionConfiguration = DeviceConfigurationQRCodeUtils.splitQRContent(content);
 
                 String identifier = connectionConfiguration.getA();
-                URL apkUrl = tryConvertToURL(connectionConfiguration.getB());
+                URL apkUrl = UrlHelper.tryConvertToURL(connectionConfiguration.getB());
 
                 if (apkUrl != null) {
-                    String serverUrl = getServerUrl(apkUrl);
+                    String serverUrl = UrlHelper.getServerUrl(apkUrl);
 
                     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
                     preferences.edit().putString(getString(R.string.preference_identifier_key), identifier).commit();
@@ -207,33 +208,13 @@ public class GeneralPreferenceFragment extends BasePreferenceFragment {
 
                     new AutoUpdater(getActivity()).checkForUpdate(false);
                 } else {
-                    String toastText = getString(R.string.error_scanning_qr_malformed);
-                    Toast.makeText(getActivity(), toastText, Toast.LENGTH_LONG).show();
+                    Toast.makeText(getActivity(), getString(R.string.error_scanning_qr_malformed), Toast.LENGTH_LONG).show();
                 }
             } catch (IllegalArgumentException e) {
-                String toastText = getString(R.string.error_scanning_qr);
-                toastText = String.format(toastText, e.getMessage());
-                Toast.makeText(getActivity(), toastText, Toast.LENGTH_LONG).show();
+                Toast.makeText(getActivity(), getString(R.string.error_scanning_qr, e.getMessage()), Toast.LENGTH_LONG).show();
             }
         } else {
-            String toastText = getString(R.string.error_scanning_qr);
-            toastText = String.format(toastText, "" + resultCode);
-            Toast.makeText(getActivity(), toastText, Toast.LENGTH_LONG).show();
-        }
-    }
-
-    protected String getServerUrl(URL apkUrl) {
-        String protocol = apkUrl.getProtocol();
-        String host = apkUrl.getHost();
-        String port = apkUrl.getPort() == -1 ? "" : ":" + apkUrl.getPort();
-        return protocol + "://" + host + port;
-    }
-
-    private URL tryConvertToURL(String url) {
-        try {
-            return new URL(url);
-        } catch (MalformedURLException e) {
-            return null;
+            Toast.makeText(getActivity(), getString(R.string.error_scanning_qr, resultCode), Toast.LENGTH_LONG).show();
         }
     }
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/UrlHelper.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/UrlHelper.java
index e426e976c04..b16bb1fba6f 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/UrlHelper.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/utils/UrlHelper.java
@@ -5,6 +5,7 @@ import java.net.URL;
 import java.util.List;
 
 import android.net.Uri;
+import android.support.annotation.Nullable;
 
 import com.sap.sse.common.Util;
 
@@ -19,4 +20,19 @@ public class UrlHelper {
         }
         return new URL(builder.build().toString());
     }
+
+    public static String getServerUrl(URL url) {
+        String protocol = url.getProtocol();
+        String host = url.getHost();
+        String port = url.getPort() == -1 ? "" : ":" + url.getPort();
+        return protocol + "://" + host + port;
+    }
+
+    public static @Nullable URL tryConvertToURL(String url) {
+        try {
+            return new URL(url);
+        } catch (MalformedURLException e) {
+            return null;
+        }
+    }
 }