diff --git a/views/userform.blade.php b/views/userform.blade.php
index f2be5db7..ee195ea3 100644
--- a/views/userform.blade.php
+++ b/views/userform.blade.php
@@ -106,6 +106,7 @@
 					@endif>
 				<div class="invalid-feedback">{{ $__t('Passwords do not match') }}</div>
 			</div>
+			@endif
 			@else
 			<input type="hidden"
 				name="password"
@@ -116,7 +117,6 @@
 				id="password_confirm"
 				value="x">
 			@endif
-			@endif
 
 			@include('components.userfieldsform', array(
 			'userfields' => $userfields,
diff --git a/views/users.blade.php b/views/users.blade.php
index e8295ca1..e22ceda4 100644
--- a/views/users.blade.php
+++ b/views/users.blade.php
@@ -25,10 +25,12 @@
 			</div>
 			<div class="related-links collapse d-md-flex order-2 width-xs-sm-100 m-1 mt-md-0 mb-md-0 float-right"
 				id="related-links">
+				@if(!defined('GROCY_EXTERNALLY_MANAGED_AUTHENTICATION'))
 				<a class="btn btn-primary responsive-button"
 					href="{{ $U('/user/new') }}">
 					{{ $__t('Add') }}
 				</a>
+				@endif
 				<a class="btn btn-outline-secondary m-1 mt-md-0 mb-md-0 float-right"
 					href="{{ $U('/userfields?entity=users') }}">
 					{{ $__t('Configure userfields') }}