diff --git a/README.md b/README.md
index e7f8cc95..b76ed35e 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Entry Editing:
   - [ ] JpegPhoto Create/Delete
   - [ ] Binary attribute upload
   - [ ] If removing an objectClass, remove all attributes that only that objectclass provided
-  - [ ] Rename an entry
+  - [ ] Move an entry
   - [ ] Group membership selection
   - [ ] Attribute tag creation
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 1751992d..691b371d 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -307,6 +307,30 @@ class HomeController extends Controller
 			->with('o',$o);
 	}
 
+	public function entry_rename(Request $request): \Illuminate\Http\RedirectResponse|\Illuminate\View\View
+	{
+		$from_dn = Crypt::decryptString($request->post('dn'));
+		Log::info(sprintf('%s:Renaming [%s] to [%s]',self::LOGKEY,$from_dn,$request->post('new_rdn')));
+
+		$o = config('server')->fetch($from_dn);
+
+		if (! $o)
+			return back()
+				->withInput()
+				->with('note',__('DN doesnt exist'));
+
+		try {
+			$o->rename($request->post('new_rdn'));
+
+		} catch (\Exception $e) {
+			return Redirect::to('/')
+				->with('failed',$e->getMessage());
+		}
+
+		return Redirect::to('/')
+			->with('success',[__('Entry renamed')]);
+	}
+
 	/**
 	 * Update a DN entry
 	 *
diff --git a/resources/views/components/attribute/widget/options.blade.php b/resources/views/components/attribute/widget/options.blade.php
index b5ab7dae..8d5b9598 100644
--- a/resources/views/components/attribute/widget/options.blade.php
+++ b/resources/views/components/attribute/widget/options.blade.php
@@ -6,7 +6,7 @@
 @php($clone=FALSE)
 <span class="p-0 m-0">
 	@if($o->is_rdn)
-		<button class="btn btn-sm btn-outline-focus mt-3" disabled><i class="fas fa-fw fa-exchange"></i> @lang('Rename')</button>
+		<span id="entry-rename" class="btn btn-sm btn-outline-focus mt-3" data-bs-toggle="modal" data-bs-target="#page-modal"><i class="fas fa-fw fa-exchange"></i> @lang('Rename')</span>
 	@elseif($edit && $o->can_addvalues)
 		@switch(get_class($o))
 			@case(Certificate::class)
@@ -26,7 +26,7 @@
 				@break
 
 			@case(ObjectClass::class)
-				<span type="button" @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) data-bs-toggle="modal" data-bs-target="#new_objectclass-modal"><i class="fas fa-fw fa-plus"></i> @lang('Add Objectclass')</span>
+				<span @class(['btn','btn-sm','btn-outline-primary','mt-3','addable','d-none'=>(! $new)]) data-bs-toggle="modal" data-bs-target="#new_objectclass-modal"><i class="fas fa-fw fa-plus"></i> @lang('Add Objectclass')</span>
 
 				<!-- NEW OBJECT CLASS -->
 				<div class="modal fade" id="new_objectclass-modal" tabindex="-1" aria-labelledby="new_objectclass-label" aria-hidden="true" data-bs-backdrop="static">
diff --git a/resources/views/frames/dn.blade.php b/resources/views/frames/dn.blade.php
index 5cc830ba..dcacd63d 100644
--- a/resources/views/frames/dn.blade.php
+++ b/resources/views/frames/dn.blade.php
@@ -282,6 +282,25 @@
 						})
 						break;
 
+					case 'entry-rename':
+						$.ajax({
+							method: 'GET',
+							url: '{{ url('modal/rename') }}/'+dn,
+							dataType: 'html',
+							cache: false,
+							beforeSend: function() {
+								that.empty().append('<span class="p-3"><i class="fas fa-3x fa-spinner fa-pulse"></i></span>');
+							},
+							success: function(data) {
+								that.empty().html(data);
+							},
+							error: function(e) {
+								if (e.status !== 412)
+									alert('That didnt work? Please try again....');
+							},
+						});
+						break;
+
 					default:
 						switch ($(item.relatedTarget).attr('name')) {
 							case 'entry-userpassword-check':
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 65084735..d4eeadb9 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -2,6 +2,7 @@
 
 @section('main-content')
 	<x-success/>
+	<x-failed/>
 
 	<div class="card card-solid mb-3">
 		<div class="card-body">
diff --git a/resources/views/modals/entry-rename.blade.php b/resources/views/modals/entry-rename.blade.php
new file mode 100644
index 00000000..5bb824d5
--- /dev/null
+++ b/resources/views/modals/entry-rename.blade.php
@@ -0,0 +1,40 @@
+<div class="modal-header bg-dark text-white">
+	<h1 class="modal-title fs-5">
+		<strong>@lang('Rename') <strong>{{ $x=Crypt::decryptString($dn) }}</strong>
+	</h1>
+</div>
+
+<form id="entry-rename-form" method="POST" action="{{ url('entry/rename') }}">
+	<div class="modal-body">
+		@csrf
+		<input type="hidden" name="dn" value="{{ $dn }}">
+
+		<div class="row">
+			<div class="col-12">
+				<label for="rdn" class="form-label">@lang('New RDN')</label>
+				<div class="input-group mb-3">
+					<input type="text" id="rdn" name="new_rdn" class="form-control w-25" placeholder="{{ $rdn=collect(explode(',',$x))->first() }}" value="{{ $rdn }}">
+					<span class="input-group-text" id="label">{{ collect(explode(',',$x))->skip(1)->join(',') }}</span>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="modal-footer">
+		<x-modal.close/>
+		<button id="entry-rename" type="submit" class="btn btn-sm btn-primary" disabled>@lang('Rename')</button>
+	</div>
+</form>
+
+<script type="text/javascript">
+	$(document).ready(function() {
+		var rdn = '{{ $rdn }}';
+
+		// Complete the RDN
+		$('#rdn').on('input',function(item) {
+			rdn = $(this).val();
+
+			$('button[id=entry-rename]').attr('disabled',! rdn.includes('='));
+		})
+	});
+</script>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index c27ed4a6..d2d8be17 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -49,6 +49,7 @@ Route::controller(HomeController::class)->group(function() {
 		Route::post('entry/password/check/','entry_password_check');
 		Route::post('entry/attr/add/{id}','entry_attr_add');
 		Route::post('entry/objectclass/add','entry_objectclass_add');
+		Route::post('entry/rename','entry_rename');
 		Route::post('entry/update/commit','entry_update');
 		Route::post('entry/update/pending','entry_pending_update');
 
@@ -56,6 +57,7 @@ Route::controller(HomeController::class)->group(function() {
 
 		Route::view('modal/delete/{dn}','modals.entry-delete');
 		Route::view('modal/export/{dn}','modals.entry-export');
+		Route::view('modal/rename/{dn}','modals.entry-rename');
 		Route::view('modal/userpassword-check/{dn}','modals.entry-userpassword-check');
 	});
 });