diff --git a/www/config/RemoteView.js b/www/config/RemoteView.js
index bf55e02c..dcf8ea0d 100644
--- a/www/config/RemoteView.js
+++ b/www/config/RemoteView.js
@@ -116,7 +116,7 @@ Ext.define('PBS.config.RemoteView', {
 
     columns: [
 	{
-	    header: gettext('Remote'),
+	    header: gettext('Remote ID'),
 	    width: 200,
 	    sortable: true,
 	    renderer: Ext.String.htmlEncode,
diff --git a/www/config/SyncView.js b/www/config/SyncView.js
index 0403977b..8f566f84 100644
--- a/www/config/SyncView.js
+++ b/www/config/SyncView.js
@@ -196,7 +196,7 @@ Ext.define('PBS.config.SyncJobView', {
 	    sortable: true,
 	},
 	{
-	    header: gettext('Remote'),
+	    header: gettext('Remote ID'),
 	    dataIndex: 'remote',
 	    width: 120,
 	    sortable: true,
diff --git a/www/form/RemoteSelector.js b/www/form/RemoteSelector.js
index 8dae6682..ae5bb623 100644
--- a/www/form/RemoteSelector.js
+++ b/www/form/RemoteSelector.js
@@ -16,7 +16,7 @@ Ext.define('PBS.form.RemoteSelector', {
     listConfig: {
 	columns: [
 	    {
-		header: gettext('Remote'),
+		header: gettext('Remote ID'),
 		sortable: true,
 		dataIndex: 'name',
 		renderer: Ext.String.htmlEncode,
diff --git a/www/window/RemoteEdit.js b/www/window/RemoteEdit.js
index 4a4d8114..3fca2131 100644
--- a/www/window/RemoteEdit.js
+++ b/www/window/RemoteEdit.js
@@ -32,7 +32,7 @@ Ext.define('PBS.window.RemoteEdit', {
 	    {
 		xtype: 'pmxDisplayEditField',
 		name: 'name',
-		fieldLabel: gettext('Remote'),
+		fieldLabel: gettext('Remote ID'),
 		renderer: Ext.htmlEncode,
 		allowBlank: false,
 		minLength: 4,
@@ -47,6 +47,7 @@ Ext.define('PBS.window.RemoteEdit', {
 		submitValue: false,
 		vtype: 'HostPort',
 		fieldLabel: gettext('Host'),
+		emptyText: gettext('FQDN or IP-address'),
 		listeners: {
 		    change: function(field, newvalue) {
 			let host = newvalue;
@@ -74,31 +75,31 @@ Ext.define('PBS.window.RemoteEdit', {
 	    },
 	    {
 		xtype: 'proxmoxtextfield',
-		hidden: true,
 		name: 'host',
+		hidden: true,
 	    },
 	    {
 		xtype: 'proxmoxtextfield',
+		name: 'port',
 		hidden: true,
 		cbind: {
 		    deleteEmpty: '{!isCreate}',
 		},
-		name: 'port',
 	    },
 	],
 
 	column2: [
 	    {
 		xtype: 'proxmoxtextfield',
-		allowBlank: false,
 		name: 'auth-id',
 		fieldLabel: gettext('Auth ID'),
+		allowBlank: false,
 	    },
 	    {
 		xtype: 'textfield',
+		name: 'password',
 		inputType: 'password',
 		fieldLabel: gettext('Password'),
-		name: 'password',
 		cbind: {
 		    emptyText: '{passwordEmptyText}',
 		    allowBlank: '{!isCreate}',
@@ -110,10 +111,11 @@ Ext.define('PBS.window.RemoteEdit', {
 	    {
 		xtype: 'proxmoxtextfield',
 		name: 'fingerprint',
+		fieldLabel: gettext('Fingerprint'),
+		emptyText: gettext("Server certificate's SHA-256 fingerprint, required for self-signed certificates"),
 		cbind: {
 		    deleteEmpty: '{!isCreate}',
 		},
-		fieldLabel: gettext('Fingerprint'),
 	    },
 	    {
 		xtype: 'proxmoxtextfield',