diff --git a/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/i18n/magentatv_de.properties b/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/i18n/magentatv_de.properties
index 14734cd78..6374fc9c8 100644
--- a/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/i18n/magentatv_de.properties
+++ b/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/i18n/magentatv_de.properties
@@ -9,8 +9,8 @@ thing-type.magentatv.receiver.description = Media Receiver zum Epmfang von Magen
 # Thing configuration
 thing-type.config.magentatv.receiver.ipAddress.label = IP-Adresse
 thing-type.config.magentatv.ipAddress.description = IP Adresse des Media Receivers
-thing-type.config.magentatv.receiver.userId.label = User ID
-thing-type.config.magentatv.receiver.userId.description = Technische Benutzerkennung, siehe Dokumentation
+thing-type.config.magentatv.receiver.userId.label = UID
+thing-type.config.magentatv.receiver.userId.description = Technische Benutzerkennung (User ID), siehe Dokumentation; wird automatisch gefüllt, wenn Login-Name und Passwort angegeben sind.
 thing-type.config.magentatv.receiver.accountName.label = Login-Name
 thing-type.config.magentatv.receiver.accountName.description = Login-Name (E-Mail) zur Anmeldung im Telekom Kundencenter
 thing-type.config.magentatv.receiver.accountPassword.label = Passwort
diff --git a/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/thing/thing-types.xml
index 6931c13ff..36b0ced03 100644
--- a/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.magentatv/src/main/resources/OH-INF/thing/thing-types.xml
@@ -21,6 +21,7 @@
 		</channel-groups>
 
 
+		<representation-property>macAddress</representation-property>
 		<config-description uri="thing-type:magentatv:receiver">
 			<parameter name="ipAddress" type="text">
 				<label>Device IP Address</label>
@@ -28,10 +29,6 @@
 				<required>true</required>
 				<context>network-address</context>
 			</parameter>
-			<parameter name="userId" type="text">
-				<label>User ID</label>
-				<description>Technical User ID required for pairing process</description>
-			</parameter>
 			<parameter name="accountName" type="text">
 				<label>Account Name</label>
 				<description>Credentials: Login name (e.g. xxx@t-online.de, same as for the Telekom Kundencenter)</description>
@@ -41,6 +38,10 @@
 				<description>Credentials: Account Password (same as for the Telekom Kundencenter)</description>
 				<context>password</context>
 			</parameter>
+			<parameter name="userId" type="text">
+				<label>User ID</label>
+				<description>Technical User ID required for pairing process, auto-filled when account credentials are given</description>
+			</parameter>
 			<parameter name="udn" type="text">
 				<label>Unique Device Name</label>
 				<description>The UDN identifies the Media Receiver</description>