diff --git a/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml b/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
index bc775c82452b31fb12003798789898068e3a3e30..3477e21c17ac67b4b2349c7f59921ee1f1c15289 100644
--- a/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
+++ b/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
@@ -16,7 +16,6 @@
 				<entry key="/dmz/">
 					<ref bean="dmzbean" />
 				</entry>
-				<!--  //TODO:PB:OLAT-4047 --> 
 				<entry key="/url/">
 					<!-- if you change /url make sure you also modify olatcore/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/_static/js/BTinyHelper.js accordingly -->
 					<ref bean="restdispatcher" />
@@ -24,15 +23,9 @@
 				<entry key="/">
 					<ref bean="redirect2defaultbean" />
 				</entry>
-				<!-- Feature provided by Frentix:
-					see
-					- Java comment in RemoteLoginformDispatcher
-					- http://bugs.olat.org/jira/browse/OLAT-3360
-					disabled by default  
 				<entry key="/remotelogin/">
 					<ref bean="remoteloginbean" />
 				</entry>
-				 -->
 				<entry key="/auth/">
 					<!-- if you change /auth make sure you also modify olatcore/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/_static/js/BTinyHelper.js accordingly -->
 					<ref bean="authbean" />
diff --git a/src/main/java/org/olat/registration/RegistrationAdminController.java b/src/main/java/org/olat/registration/RegistrationAdminController.java
index 47bb46310c1fd2e8fad7e292353d320f84113c9d..564681a1a1c31d4471294af525fc8d56ae09fac3 100644
--- a/src/main/java/org/olat/registration/RegistrationAdminController.java
+++ b/src/main/java/org/olat/registration/RegistrationAdminController.java
@@ -158,6 +158,15 @@ public class RegistrationAdminController extends FormBasicController {
 		String propertyValue = registrationModule.getStaticPropertyMappingValue();
 		propertyValueElement = uifactory.addTextElement("admin.registration.prop.value", "admin.registration.propertyValue", 255, propertyValue, staticPropContainer);
 		
+		//static property
+		FormLayoutContainer remoteLoginContainerContainer = FormLayoutContainer.createDefaultFormLayout("remotelogin", getTranslator());
+		remoteLoginContainerContainer.setRootForm(mainForm);
+		remoteLoginContainerContainer.setFormTitle("remote.login.title");
+		formLayout.add(remoteLoginContainerContainer);
+		
+		String remoteExample = generateRemoteLoginExampleCode();
+		uifactory.addTextAreaElement("remotelogin.example", "admin.registrationLinkExample", 2000, 4, 65, true, remoteExample, remoteLoginContainerContainer);
+		
 		FormLayoutContainer buttonGroupLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
 		buttonGroupLayout.setRootForm(mainForm);
 		uifactory.addFormSubmitButton("save", buttonGroupLayout);
@@ -276,4 +285,16 @@ public class RegistrationAdminController extends FormBasicController {
 		    .append("</form>");
 		return code.toString();
 	}
+	
+	private String generateRemoteLoginExampleCode() {
+		StringBuilder code = new StringBuilder();
+		code.append("<form name=\"olatremotelogin\" action=\"")
+		    .append(Settings.getServerContextPathURI()).append("/remotelogin/")
+		    .append("\" method=\"post\" target=\"OpenOLAT\" onsubmit=\"var openolat=window.open(,'OpenOLAT', 'location=no,menubar=no,resizable=yes,toolbar=no,statusbar=no,scrollbars=yes'); openolat.focus();\">\n")
+		    .append("  Benutzername	<input type=\"text\" name=\"username\">")
+		    .append("  Passwort	<input type=\"password\" name=\"pwd\">")
+		    .append("  <input type=\"submit\" value=\"Login\">\n")
+		    .append("</form>");
+		return code.toString();
+	}
 }
diff --git a/src/main/java/org/olat/registration/_content/admin.html b/src/main/java/org/olat/registration/_content/admin.html
index 84dca7ddba02b22e876ebd4713b782bfb3992331..b2506f1a1880075f4c586537ecc6a4f5c357975a 100644
--- a/src/main/java/org/olat/registration/_content/admin.html
+++ b/src/main/java/org/olat/registration/_content/admin.html
@@ -1,4 +1,5 @@
 $r.render("settings")
 $r.render("domains")
 $r.render("propertiesmapping")
+$r.render("remotelogin")
 $r.render("buttons")
\ No newline at end of file
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
index 08f5d1a582558babd5244046f46c34b428bab7a5..8ce14899aa6bad2a0a2a4a8f42cf55b21542849c 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
@@ -76,6 +76,7 @@ reg.error.user_in_use=Benutzername ist schon besetzt
 registration.form.cancelled=Sie haben die Registrierung abgebrochen.
 regkey.missing=Der Registrierungsschl\u00FCssel fehlt. Fordern Sie bitte einen neuen an.
 regkey.missingentry=Dieser Registrierungsschl\u00FCssel existiert nicht. Bitte fordern Sie einen neuen an.
+remote.login.title=Remote Login
 select.language.description=W\u00E4hlen Sie die Sprache f\u00FCr die OpenOLAT Registrierung und Ihr Benutzerkonto. Sie k\u00F6nnen die Sprache sp\u00E4ter in Ihrem Benutzerprofil jederzeit anpassen. Anschliessend werden Sie durch den Registrationprozess gef\u00FChrt.
 select.language=Sprache
 sr.error.disclaimer.checkbox=Sie m\u00FCssen durch Anklicken des K\u00E4stchens best\u00E4tigen, dass Sie die Nutzungsbedingungen gelesen und verstanden haben und diese akzeptieren.
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
index 72584f8f5e55626b125cb9b212dff6d7b5b4a71c..ebc797b28cadf11cbeff7b679a9ab73361f1f0f4 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
@@ -77,6 +77,7 @@ reg.wherefrom=This registration request to the server {0} was made on {1} \nfrom
 registration.form.cancelled=You have cancelled the registration process.
 regkey.missing=Registration key missing. Please ask for a new one.
 regkey.missingentry=This registration key does not exist. Please ask for another one.
+remote.login.title=Remote login
 select.language=Language
 select.language.description=Please select a language for your OpenOLAT registration and user account. Later on you can adapt your choice in your user profile at any time. You will then be guided through the registration process.
 sr.error.disclaimer.checkbox=You have to confirm by clicking on the small box that you have read the disclaimer, do understand and accept it.