diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index ebb39d7cba..ec7c037138 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -454,7 +454,6 @@ class CuraApplication(QtApplication):
             # Misc.:
             "ConsoleLogger", #You want to be able to read the log if something goes wrong.
             "CuraEngineBackend", #Cura is useless without this one since you can't slice.
-            # NOTE: User-Agreement is part of the 'onboarding flow' now (See Welcome Pages).
             "FileLogger", #You want to be able to read the log if something goes wrong.
             "XmlMaterialProfile", #Cura crashes without this one.
             "Toolbox", #This contains the interface to enable/disable plug-ins, so if you disable it you can't enable it back.
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 9f49743a0f..37a34ebb52 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -78,13 +78,13 @@ UM.MainWindow
         {
             welcomeDialog.visible = true;
             welcomeDialog.currentStep = 0;
-            welcomeDialog.show();
         }
         else
         {
-            welcomeDialog.hide()
             welcomeDialog.visible = false;
         }
+        // TODO: While the new onboarding process contains the user-agreement,
+        //       it should probably not entirely rely on 'needToShowUserAgreement' for show/hide.
     }
 
     Item
diff --git a/resources/qml/WelcomePages/AddPrinterByIpContent.qml b/resources/qml/WelcomePages/AddPrinterByIpContent.qml
index 40216ec235..f3ed58200b 100644
--- a/resources/qml/WelcomePages/AddPrinterByIpContent.qml
+++ b/resources/qml/WelcomePages/AddPrinterByIpContent.qml
@@ -18,7 +18,6 @@ Item
 
     id: addPrinterByIpScreen
 
-    property bool hasPushedAdd: false
     property bool hasSentRequest: false
     property bool haveConnection: false
 
@@ -42,7 +41,7 @@ Item
         anchors.topMargin: UM.Theme.getSize("default_margin").height
         anchors.bottomMargin: UM.Theme.getSize("default_margin").height
         anchors.horizontalCenter: parent.horizontalCenter
-        width: (parent.width * 3 / 4) | 0
+        width: Math.floor(parent.width * 3 / 4)
 
         Item
         {
@@ -79,7 +78,7 @@ Item
 
                     validator: RegExpValidator
                     {
-                        regExp: /[0-9\.\-\_]*/
+                        regExp: /[a-fA-F0-9\.\:]*/
                     }
 
                     onAccepted: addPrinterButton.clicked()
@@ -99,12 +98,11 @@ Item
                     {
                         if (hostnameField.text.trim() != "")
                         {
-                            addPrinterByIpScreen.hasPushedAdd = true
-                            UM.OutputDeviceManager.addManualDevice(hostnameField.text, hostnameField.text)
+                            enabled = false;
+                            UM.OutputDeviceManager.addManualDevice(hostnameField.text, hostnameField.text);
                         }
                     }
 
-                    enabled: ! addPrinterByIpScreen.hasPushedAdd
                     BusyIndicator
                     {
                         anchors.fill: parent