diff --git a/resources/views/components/attribute/password.blade.php b/resources/views/components/attribute/password.blade.php
index 01b9f2da..6e6de066 100644
--- a/resources/views/components/attribute/password.blade.php
+++ b/resources/views/components/attribute/password.blade.php
@@ -3,7 +3,7 @@
 	@foreach($o->langtags as $langtag)
 		@foreach(($o->tagValues($langtag)->count() ? $o->tagValues($langtag) : [$langtag => NULL]) as $key => $value)
 			@if($edit)
-				<div class="input-group has-validation mb-3">
+				<div class="input-group has-validation">
 					<x-form.select id="userpassword_hash_{{$loop->index}}{{$template ?? ''}}" name="userpassword_hash[{{ $langtag }}][]" :value="$o->hash($new ? '' : ($value ?? ''))->id()" :options="$helpers" allowclear="false" :disabled="! $new"/>
 					<input type="password" @class(['form-control','is-invalid'=>($e=$errors->get($o->name_lc.'.'.$langtag.'.'.$loop->index)),'mb-1','border-focus'=>! $o->tagValuesOld($langtag)->contains($value),'bg-success-subtle'=>$updated]) name="{{ $o->name_lc }}[{{ $langtag }}][]" value="{{ Arr::get(old($o->name_lc),$langtag.'.'.$loop->index,$value ? md5($value) : '') }}" @readonly(! $new)>
 
@@ -20,9 +20,9 @@
 	@endforeach
 </x-attribute.layout>
 
-@if($edit)
+@if($edit && $o->tagValuesOld($langtag)->dot()->filter()->count())
 	<div class="row">
-		<div class="offset-1 col-4 p-2">
+		<div class="offset-1 col-4">
 			<span class="p-0 m-0">
 				<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>
diff --git a/resources/views/frames/create.blade.php b/resources/views/frames/create.blade.php
index 8326a638..2454da57 100644
--- a/resources/views/frames/create.blade.php
+++ b/resources/views/frames/create.blade.php
@@ -91,7 +91,6 @@
 @endsection
 
 @section('page-scripts')
-
 	<script type="text/javascript">
 		var rdn_attr;