diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 306d3fc8..d670e81f 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -137,7 +137,7 @@ class HomeController extends Controller
 					abort(599,$e->getDetailedError()->getErrorMessage());
 			}
 
-		// @todo To test and valide this Exception is caught
+		// @todo when we create an entry, and it already exists, enable a redirect to it
 		} catch (LdapRecordException $e) {
 			$request->flash();
 
diff --git a/resources/views/components/attribute/rdn.blade.php b/resources/views/components/attribute/rdn.blade.php
index afb6f1d7..d08a2218 100644
--- a/resources/views/components/attribute/rdn.blade.php
+++ b/resources/views/components/attribute/rdn.blade.php
@@ -34,8 +34,13 @@
 @section('page-scripts')
 	<script type="text/javascript">
 		$(document).ready(function() {
-			var rdn_value_set = null;
-			var rdn_attr = null;
+			var rdn_value_set = $('input#rdn_value').val();
+			rdn_attr = $('select#rdn').val();
+
+			if (rdn_attr) {
+				$('#'+rdn_attr).find('input').attr('readonly',true);
+				set_rdn_value();
+			}
 
 			function set_rdn_value() {
 				if (rdn_attr && rdn_value_set)
diff --git a/resources/views/frames/create.blade.php b/resources/views/frames/create.blade.php
index 79193bae..4bb131b5 100644
--- a/resources/views/frames/create.blade.php
+++ b/resources/views/frames/create.blade.php
@@ -68,6 +68,7 @@
 @section('page-scripts')
 	<script type="text/javascript">
 		var oc = {!! $oo->getObject('objectclass')->values !!};
+		var rdn_attr;
 
 		function editmode() {
 			// Find all input items and turn off readonly
@@ -76,6 +77,10 @@
 				if ($(this)[0].name.match(/^objectclass/))
 					return;
 
+				// Dont take of the readonly value for our RDN if it is set
+				if (rdn_attr && ($(this)[0].name === rdn_attr+'[]'))
+					return;
+
 				$(this).attr('readonly',false);
 			});