diff --git a/harbour-nextcloudnotes.pro b/harbour-nextcloudnotes.pro
index 1df938e..25db55d 100644
--- a/harbour-nextcloudnotes.pro
+++ b/harbour-nextcloudnotes.pro
@@ -27,6 +27,7 @@ SOURCES += src/harbour-nextcloudnotes.cpp \
     src/notesmodel.cpp
 
 DISTFILES += qml/harbour-nextcloudnotes.qml \
+    LoginWebview.qml \
     qml/cover/CoverPage.qml \
     rpm/harbour-nextcloudnotes.changes.run.in \
     rpm/harbour-nextcloudnotes.changes \
diff --git a/qml/pages/LoginDialog.qml b/qml/pages/LoginDialog.qml
index 9b16d60..7d8a7fb 100644
--- a/qml/pages/LoginDialog.qml
+++ b/qml/pages/LoginDialog.qml
@@ -74,6 +74,7 @@ Dialog {
         Column {
             id: column
             width: parent.width
+            spacing: Theme.paddingLarge
 
             DialogHeader {
                 //title: qsTr("Nextcloud Login")
@@ -87,15 +88,26 @@ Dialog {
                 source: "../img/nextcloud-logo-transparent.png"
             }
 
+            TextField {
+                width: parent.width
+                placeholderText: qsTr("Nextcloud server")
+                validator: RegExpValidator { regExp: /^https?:\/\/([-a-zA-Z0-9@:%._\+~#=].*)/ }
+                inputMethodHints: Qt.ImhUrlCharactersOnly
+                label: placeholderText
+                onClicked: if (text === "") text = "https://"
+                onTextChanged: {
+                    if (acceptableInput)
+                        notesApi.host = text
+                }
+            }
+
             Column {
                 id: flowv2LoginColumn
                 width: parent.width
+                spacing: Theme.paddingLarge
                 visible: notesApi.statusVersion.split('.')[0] >= 16
-
                 Label {
-                    x: Theme.horizontalPageMargin
-                    width: parent.width - 2*x
-                    text: qsTr("Login Flow v2") + " " + notesApi.statusVersionString
+                    text: "Flow Login v2"
                 }
             }
 
@@ -103,11 +115,8 @@ Dialog {
                 id: legacyLoginColumn
                 width: parent.width
                 visible: !flowv2LoginColumn.visible
-
                 Label {
-                    x: Theme.horizontalPageMargin
-                    width: parent.width - 2*x
-                    text: qsTr("Legacy Login") + " " + notesApi.statusVersionString
+                    text: "Legacy Login"
                 }
             }
 
diff --git a/translations/harbour-nextcloudnotes-de.ts b/translations/harbour-nextcloudnotes-de.ts
index f757f73..77fe2ae 100644
--- a/translations/harbour-nextcloudnotes-de.ts
+++ b/translations/harbour-nextcloudnotes-de.ts
@@ -115,14 +115,6 @@
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Login Flow v2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Legacy Login</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Account name</source>
         <translation type="unfinished"></translation>
diff --git a/translations/harbour-nextcloudnotes-sv.ts b/translations/harbour-nextcloudnotes-sv.ts
index 18dfb36..d3f31c8 100644
--- a/translations/harbour-nextcloudnotes-sv.ts
+++ b/translations/harbour-nextcloudnotes-sv.ts
@@ -115,14 +115,6 @@
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Login Flow v2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Legacy Login</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Account name</source>
         <translation type="unfinished"></translation>
diff --git a/translations/harbour-nextcloudnotes.ts b/translations/harbour-nextcloudnotes.ts
index 2153b66..f12e6d3 100644
--- a/translations/harbour-nextcloudnotes.ts
+++ b/translations/harbour-nextcloudnotes.ts
@@ -131,7 +131,7 @@
     </message>
     <message>
         <location filename="../qml/pages/LoginDialog.qml" line="80"/>
-        <location filename="../qml/pages/LoginDialog.qml" line="174"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="186"/>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
@@ -141,67 +141,58 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="98"/>
-        <source>Login Flow v2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="110"/>
-        <source>Legacy Login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="120"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="132"/>
         <source>Account name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="135"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="101"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="147"/>
         <source>Nextcloud server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="150"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="162"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="163"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="175"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="174"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="186"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="183"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="195"/>
         <source>Follow the login procedure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="191"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="203"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="198"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="210"/>
         <source>&lt;strong&gt;CAUTION: Your password will be saved without any encryption on the device!&lt;/strong&gt;&lt;br&gt;Please consider creating a dedicated app password! Open your Nextcloud in a browser and go to &lt;i&gt;Settings&lt;/i&gt; → &lt;i&gt;Security&lt;/i&gt;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="202"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="214"/>
         <source>Do not check certificates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="203"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="215"/>
         <source>Enable this option to allow selfsigned certificates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/LoginDialog.qml" line="209"/>
+        <location filename="../qml/pages/LoginDialog.qml" line="221"/>
         <source>Allow unencrypted connections</source>
         <translation type="unfinished"></translation>
     </message>