diff --git a/css/style.css b/css/style.css
index a0f30bb..3987ce6 100644
--- a/css/style.css
+++ b/css/style.css
@@ -30,12 +30,3 @@ input[type="submit"] {
 .groupofone {
 	position: relative;
 }
-
-#show-password {
-	margin-left: 0px!important;
-	padding-left: 0px!important;
-}
-
-#submit {
-	margin-top: 24px!important;
-}
diff --git a/js/form.js b/js/form.js
index 7a8812d..162df5d 100644
--- a/js/form.js
+++ b/js/form.js
@@ -11,4 +11,5 @@ function togglePasswordTextFieldVisibility() {
 $(document).ready(function() {
     passwordTextField = $("#password");
     $("#show").change(togglePasswordTextFieldVisibility);
+    $("#showadminpass").change(togglePasswordTextFieldVisibility);
 });
diff --git a/templates/form.php b/templates/form.php
index e03f3f2..924472e 100644
--- a/templates/form.php
+++ b/templates/form.php
@@ -33,8 +33,13 @@ if ( \OCP\Util::getVersion()[0] >= 12 )
 			<input type="password" name="password" id="password" placeholder="<?php p($l->t('Password')); ?>"/>
 			<label for="password" class="infield"><?php p($l->t( 'Password' )); ?></label>
 			<img id="password-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
+			<?php if ( \OC::$server->getConfig()->getAppValue('core', 'vendor', '') === 'nextcloud' ) { ?>
 			<input id="show" name="show" type="checkbox">
-			<label id="show-password" style="display: inline;" for="show"><?php p($l->t( 'Show password' )); ?></label>
+			<label id="show-password" style="display: inline;" for="show"></label>
+			<?php } else { ?>
+			<input type="checkbox" id="showadminpass" name="showadminpass">
+			<label for="showadminpass"></label>
+			<?php } ?>
 		</p>
 		<input type="submit" id="submit" value="<?php p($l->t('Create account')); ?>" />
 	</fieldset>