diff --git a/client/ui/qml/Pages2/PageSettingsServerInfo.qml b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
index e2e7868c..df740ff9 100644
--- a/client/ui/qml/Pages2/PageSettingsServerInfo.qml
+++ b/client/ui/qml/Pages2/PageSettingsServerInfo.qml
@@ -102,6 +102,7 @@ PageType {
                             headerText: qsTr("Server name")
                             textFieldText: name
                             textField.maximumLength: 30
+                            checkEmptyText: true
                         }
 
                         BasicButtonType {
@@ -110,10 +111,14 @@ PageType {
                             text: qsTr("Save")
 
                             onClicked: {
+                                if (serverName.textFieldText === "") {
+                                    return
+                                }
+
                                 if (serverName.textFieldText !== name) {
                                     name = serverName.textFieldText
-                                    serverNameEditDrawer.visible = false
                                 }
+                                serverNameEditDrawer.visible = false
                             }
                         }
                     }
diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
index 67a66931..de3897a8 100644
--- a/client/ui/qml/Pages2/PageShare.qml
+++ b/client/ui/qml/Pages2/PageShare.qml
@@ -260,6 +260,7 @@ PageType {
 
                 headerText: qsTr("User name")
                 textFieldText: "New client"
+                textField.maximumLength: 20
 
                 checkEmptyText: true
             }
@@ -470,7 +471,9 @@ PageType {
                 imageSource: "qrc:/images/controls/share-2.svg"
 
                 onClicked: {
-                    ExportController.generateConfig(root.connectionTypesModel[exportTypeSelector.currentIndex].type)
+                    if (clientNameTextField.textFieldText !== "") {
+                        ExportController.generateConfig(root.connectionTypesModel[exportTypeSelector.currentIndex].type)
+                    }
                 }
             }
 
@@ -624,7 +627,8 @@ PageType {
                                                 Layout.fillWidth: true
                                                 headerText: qsTr("Client name")
                                                 textFieldText: clientName
-                                                textField.maximumLength: 30
+                                                textField.maximumLength: 20
+                                                checkEmptyText: true
                                             }
 
                                             BasicButtonType {
@@ -633,6 +637,10 @@ PageType {
                                                 text: qsTr("Save")
 
                                                 onClicked: {
+                                                    if (clientNameEditor.textFieldText === "") {
+                                                        return
+                                                    }
+
                                                     if (clientNameEditor.textFieldText !== clientName) {
                                                         PageController.showBusyIndicator(true)
                                                         ExportController.renameClient(index,
@@ -661,7 +669,7 @@ PageType {
                                     text: qsTr("Revoke")
 
                                     onClicked: function() {
-                                        questionDrawer.headerText = qsTr("Revoke the config for a user - ") + clientName + "?"
+                                        questionDrawer.headerText = qsTr("Revoke the config for a user - %1?").arg(clientName)
                                         questionDrawer.descriptionText = qsTr("The user will no longer be able to connect to your server.")
                                         questionDrawer.yesButtonText = qsTr("Continue")
                                         questionDrawer.noButtonText = qsTr("Cancel")