diff --git a/resources/views/components/attribute/password.blade.php b/resources/views/components/attribute/password.blade.php
index 895dc168..943f4b6b 100644
--- a/resources/views/components/attribute/password.blade.php
+++ b/resources/views/components/attribute/password.blade.php
@@ -23,7 +23,7 @@
 	<div class="row">
 		<div class="offset-1 col-4 p-2">
 			<span class="p-0 m-0">
-				<button type="button" class="btn btn-sm btn-outline-dark mt-3" data-bs-toggle="modal" data-bs-target="#userpassword_check-modal"><i class="fas fa-user-check"></i> @lang('Check Password')</button>
+				<button id="entry-userpassword-check" type="button" class="btn btn-sm btn-outline-dark mt-3" data-bs-toggle="modal" data-bs-target="#page-modal"><i class="fas fa-user-check"></i> @lang('Check Password')</button>
 			</span>
 		</div>
 	</div>
diff --git a/resources/views/frames/dn.blade.php b/resources/views/frames/dn.blade.php
index 0140ace0..c0c6949c 100644
--- a/resources/views/frames/dn.blade.php
+++ b/resources/views/frames/dn.blade.php
@@ -113,42 +113,6 @@
 			<div class="modal-content"></div>
 		</div>
 	</div>
-
-	@if($up=$o->getObject('userpassword'))
-		<!-- CHECK USERPASSWORD -->
-		<div class="modal fade" id="userpassword_check-modal" tabindex="-1" aria-labelledby="userpassword_check-label" aria-hidden="true">
-			<div class="modal-dialog modal-lg modal-fullscreen-lg-down">
-				<div class="modal-content">
-					<div class="modal-header">
-						<h1 class="modal-title fs-5" id="userpassword_check-label">Check Passwords for {{ $dn }}</h1>
-						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-					</div>
-
-					<div class="modal-body">
-						<table class="table table-bordered p-1">
-							@foreach($up->values as $key => $value)
-								<tr>
-									<th>Check</th>
-									<td>{{ $up->render_item_old($key) }}</td>
-									<td>
-										<input type="password" style="width: 90%" name="password[{{$key}}]"> <i class="fas fa-fw fa-lock"></i>
-										<div class="invalid-feedback pb-2">
-											Invalid Password
-										</div>
-									</td>
-								</tr>
-							@endforeach
-						</table>
-					</div>
-
-					<div class="modal-footer">
-						<button type="button" class="btn btn-sm btn-secondary" data-bs-dismiss="modal">Close</button>
-						<button type="button" class="btn btn-sm btn-primary" id="userpassword_check-submit"><i class="fas fa-fw fa-spinner fa-spin d-none"></i> Check</button>
-					</div>
-				</div>
-			</div>
-		</div>
-	@endif
 @endsection
 
 @section('page-scripts')
@@ -254,7 +218,7 @@
 								that = $('#entry_export');
 
 								$.ajax({
-									type: 'GET',
+									method: 'GET',
 									url: '{{ url('entry/export') }}/'+dn,
 									cache: false,
 									beforeSend: function() {
@@ -276,68 +240,30 @@
 						})
 						break;
 
+					case 'entry-userpassword-check':
+						$.ajax({
+							method: 'GET',
+							url: '{{ url('modal/userpassword-check') }}/'+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:
 						console.log('No action for button:'+$(item.relatedTarget).attr('id'));
 				}
 			});
 
-			@if($up)
-				$('button[id=userpassword_check-submit]').on('click',function(item) {
-					var that = $(this);
-
-					var passwords = $('#userpassword_check-modal')
-						.find('input[name^="password["')
-						.map((key,item)=>item.value);
-
-					if (passwords.length === 0) return false;
-
-					$.ajax({
-						type: 'POST',
-						beforeSend: function() {
-							// Disable submit, add spinning icon
-							that.prop('disabled',true);
-							that.find('i').removeClass('d-none');
-						},
-						complete: function() {
-							that.prop('disabled',false);
-							that.find('i').addClass('d-none');
-						},
-						success: function(data) {
-							data.forEach(function(item,key) {
-								var i = $('#userpassword_check-modal')
-									.find('input[name="password['+key+']')
-									.siblings('i');
-
-								var feedback = $('#userpassword_check-modal')
-									.find('input[name="password['+key+']')
-									.siblings('div.invalid-feedback');
-
-								if (item === 'OK') {
-									i.removeClass('text-danger').addClass('text-success').removeClass('fa-lock').addClass('fa-lock-open');
-									if (feedback.is(':visible'))
-										feedback.hide();
-								} else {
-									i.removeClass('text-success').addClass('text-danger').removeClass('fa-lock-open').addClass('fa-lock');
-									if (! feedback.is(':visible'))
-										feedback.show();
-								}
-							})
-						},
-						error: function(e) {
-							if (e.status !== 412)
-								alert('That didnt work? Please try again....');
-						},
-						url: '{{ url('entry/password/check') }}',
-						data: {
-							dn: dn,
-							password: Array.from(passwords),
-						},
-						dataType: 'json',
-						cache: false
-					})
-				});
-			@endif
-
 			@if(old())
 				editmode();
 			@endif
diff --git a/resources/views/modals/entry-export.blade.php b/resources/views/modals/entry-export.blade.php
index ac507950..5c0eab5b 100644
--- a/resources/views/modals/entry-export.blade.php
+++ b/resources/views/modals/entry-export.blade.php
@@ -10,10 +10,10 @@
 
 <div class="modal-footer">
 	<x-modal.close/>
-	<button id="entry_export-download" type="button" class="btn btn-sm btn-primary">Download</button>
+	<button id="entry_export-download" type="button" class="btn btn-sm btn-primary">@lang('Download')</button>
 </div>
 
-<script>
+<script type="text/javascript">
 	function download(filename,text) {
 		var element = document.createElement('a');
 
diff --git a/resources/views/modals/entry-userpassword-check.blade.php b/resources/views/modals/entry-userpassword-check.blade.php
new file mode 100644
index 00000000..27dd77fa
--- /dev/null
+++ b/resources/views/modals/entry-userpassword-check.blade.php
@@ -0,0 +1,86 @@
+@php
+	$o = $server->fetch(Crypt::decryptString($dn))
+@endphp
+<div class="modal-header bg-dark text-white">
+	<h1 class="modal-title fs-5">Check Passwords for {{ $o->getDN() }}</h1>
+</div>
+
+<div class="modal-body">
+	<table class="table table-bordered p-1">
+		@foreach(($up=$o->getObject('userpassword'))->values as $key => $value)
+			<tr>
+				<th>Check</th>
+				<td>{{ $up->render_item_old($key) }}</td>
+				<td>
+					<input type="password" style="width: 90%" name="password[{{$key}}]"> <i class="fas fa-fw fa-lock"></i>
+					<div class="invalid-feedback pb-2">
+						@lang('Invalid Password')
+					</div>
+				</td>
+			</tr>
+		@endforeach
+	</table>
+</div>
+
+<div class="modal-footer">
+	<x-modal.close/>
+	<button id="userpassword_check-submit" type="button" class="btn btn-sm btn-primary"><i class="fas fa-fw fa-spinner fa-spin d-none"></i> @lang('Check')</button>
+</div>
+
+<script type="text/javascript">
+	$('button[id=userpassword_check-submit]').on('click',function(item) {
+		var that = $(this);
+
+		var passwords = $('#page-modal')
+			.find('input[name^="password["')
+			.map((key,item)=>item.value);
+
+		if (passwords.length === 0) return false;
+
+		$.ajax({
+			method: 'POST',
+			url: '{{ url('entry/password/check') }}',
+			data: {
+				dn: dn,
+				password: Array.from(passwords),
+			},
+			dataType: 'json',
+			cache: false,
+			beforeSend: function() {
+				// Disable submit, add spinning icon
+				that.prop('disabled',true);
+				that.find('i').removeClass('d-none');
+			},
+			complete: function() {
+				that.prop('disabled',false);
+				that.find('i').addClass('d-none');
+			},
+			success: function(data) {
+				data.forEach(function(item,key) {
+					var i = $('#page-modal')
+						.find('input[name="password['+key+']')
+						.siblings('i');
+
+					var feedback = $('#page-modal')
+						.find('input[name="password['+key+']')
+						.siblings('div.invalid-feedback');
+
+					if (item === 'OK') {
+						i.removeClass('text-danger').addClass('text-success').removeClass('fa-lock').addClass('fa-lock-open');
+						if (feedback.is(':visible'))
+							feedback.hide();
+
+					} else {
+						i.removeClass('text-success').addClass('text-danger').removeClass('fa-lock-open').addClass('fa-lock');
+						if (! feedback.is(':visible'))
+							feedback.show();
+					}
+				})
+			},
+			error: function(e) {
+				if (e.status !== 412)
+					alert('That didnt work? Please try again....');
+			},
+		})
+	});
+</script>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 8498ca0f..02b66e68 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -55,5 +55,6 @@ 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/userpassword-check/{dn}','modals.entry-userpassword-check');
 	});
 });
\ No newline at end of file