diff --git a/customer_index.php b/customer_index.php
index 7b821082..2eba33a5 100644
--- a/customer_index.php
+++ b/customer_index.php
@@ -190,7 +190,7 @@ if ($page == 'overview') {
 			\Froxlor\UI\Response::redirectTo($filename);
 		}
 	} else {
-		eval("echo \"" . \Froxlor\UI\Template::getTemplate('index/change_password') . "\";");
+		UI::view('user/change_password.html.twig');
 	}
 } elseif ($page == 'change_language') {
 	if (isset($_POST['send']) && $_POST['send'] == 'send') {
diff --git a/lib/tablelisting/admin/tablelisting.sslcertificates.php b/lib/tablelisting/tablelisting.sslcertificates.php
similarity index 100%
rename from lib/tablelisting/admin/tablelisting.sslcertificates.php
rename to lib/tablelisting/tablelisting.sslcertificates.php
diff --git a/ssl_certificates.php b/ssl_certificates.php
index 50c77579..524c6c6a 100644
--- a/ssl_certificates.php
+++ b/ssl_certificates.php
@@ -50,11 +50,14 @@ if ($action == 'delete') {
 $log->logAction(FroxlorLogger::USR_ACTION, LOG_NOTICE, "viewed domains::ssl_certificates");
 
 try {
-	$certificates_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/admin/tablelisting.sslcertificates.php';
+	$certificates_list_data = include_once dirname(__FILE__) . '/lib/tablelisting/tablelisting.sslcertificates.php';
 	$collection = (new Collection(Certificates::class, $userinfo))
-		->has('domains', \Froxlor\Api\Commands\Domains::class, 'domainid', 'id')
-		->has('customer', \Froxlor\Api\Commands\Customers::class, 'customerid', 'customerid')
 		->withPagination($certificates_list_data['sslcertificates_list']['columns']);
+	if ($userinfo['adminisession'] == 1) {
+		$collection->has('domains', \Froxlor\Api\Commands\Domains::class, 'domainid', 'id');
+	} else {
+		$collection->has('domains', \Froxlor\Api\Commands\SubDomains::class, 'domainid', 'id');
+	}
 } catch (Exception $e) {
 	Response::dynamic_error($e->getMessage());
 }
diff --git a/templates/Froxlor/user/change_password.html.twig b/templates/Froxlor/user/change_password.html.twig
index d1c1444a..2c3524f0 100644
--- a/templates/Froxlor/user/change_password.html.twig
+++ b/templates/Froxlor/user/change_password.html.twig
@@ -20,6 +20,26 @@
 							<label for="new_password_confirm" class="col-form-label">{{ lng('changepassword.new_password_confirm') }}</label>
 							<input class="form-control" type="password" name="new_password_confirm" id="new_password_confirm" value="" required/>
 						</div>
+
+						{% if userinfo.adminsession == 0 %}
+
+							<div class="mb-3">
+								<label for="change_main_ftp" class="col-form-label">{{ lng('changepassword.also_change_ftp') }}</label>
+								<div class="form-check form-switch">
+									<input type="hidden" name="change_main_ftp" value="false">
+									<input class="form-check-input" type="checkbox" name="change_main_ftp" id="change_main_ftp" value="true" checked>
+								</div>
+							</div>
+
+							<div class="mb-3">
+								<label for="change_stats" class="col-form-label">{{ lng('changepassword.also_change_stats') }}</label>
+								<div class="form-check form-switch">
+									<input type="hidden" name="change_stats" value="false">
+									<input class="form-check-input" type="checkbox" name="change_stats" id="change_stats" value="true" checked>
+								</div>
+							</div>
+
+						{% endif %}
 					</div>
 
 					<div class="card-body d-grid gap-2">