diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php
index dbda65c47ace65ce1a51e215136f085ea952163b..221cae5cfcd1bf154097c257a802f173c5ebfe71 100644
--- a/lib/Service/UserService.php
+++ b/lib/Service/UserService.php
@@ -48,10 +48,16 @@ class UserService {
 		$this->defaults = $defaults;
 		$this->l10nFactory = $l10nFactory;
 		$this->LDAPConnectionService = $LDAPConnectionService;
+		$commonServiceURL = $this->config->getSystemValue('common_services_url', '');
+
+		if (!empty($commonServiceURL)) {
+			$commonServiceURL = rtrim($commonServiceURL, '/') . '/';
+		}
+
 		$this->apiConfig = [
 			'mainDomain' => $this->config->getSystemValue('main_domain', ''),
-			'commonApiUrl' => rtrim($this->config->getSystemValue('common_services_url', ''), '/') . '/',
-			'commonServiceToken' => $this->config->getSystemValue('common_service_token', ''),
+			'commonServicesURL' => $commonServiceURL,
+			'commonServicesToken' => $this->config->getSystemValue('common_services_token', ''),
 			'aliasDomain' => $this->config->getSystemValue('alias_domain', ''),
 			'commonApiVersion' => $this->config->getSystemValue('common_api_version', ''),
 			'userCluserId' => $this->config->getSystemValue('user_cluser_id', ''),
@@ -315,13 +321,13 @@ class UserService {
 	 * @return void
 	 */
 	public function createHMEAlias(string $username, string $resultmail): void {
-		$commonApiUrl = $this->apiConfig['commonApiUrl'];
+		$commonServicesURL = $this->apiConfig['commonServicesURL'];
 		$aliasDomain = $this->apiConfig['aliasDomain'];
-		$token = $this->apiConfig['commonServiceToken'];
+		$token = $this->apiConfig['commonServicesToken'];
 		$commonApiVersion = $this->apiConfig['commonApiVersion'];
 		
 		$endpoint = $commonApiVersion . '/aliases/hide-my-email/';
-		$url = $commonApiUrl . $endpoint . $resultmail;
+		$url = $commonServicesURL . $endpoint . $resultmail;
 		$data = array(
 			"domain" => $aliasDomain
 		);
@@ -348,14 +354,14 @@ class UserService {
 	 * @return mixed The result of the domain alias creation request, decoded from JSON.
 	 */
 	public function createNewDomainAlias(string $username, string $userEmail): mixed {
-		$commonApiUrl = $this->apiConfig['commonApiUrl'];
+		$commonServicesURL = $this->apiConfig['commonServicesURL'];
 		$commonApiVersion = $this->config->getSystemValue('commonApiVersion', '');
 		$domain = $this->apiConfig['mainDomain'];
-		$token = $this->apiConfig['commonServiceToken'];
+		$token = $this->apiConfig['commonServicesToken'];
 		$commonApiVersion = $this->apiConfig['commonApiVersion'];
 
 		$endpoint = $commonApiVersion . '/aliases/';
-		$url = $commonApiUrl . $endpoint . $userEmail;
+		$url = $commonServicesURL . $endpoint . $userEmail;
 
 		$data = array(
 			"alias" => $username,
@@ -395,16 +401,16 @@ class UserService {
 	}
 
 	public function isUsernameTaken(string $username) : bool {
-		$commonApiUrl = $this->apiConfig['commonApiUrl'];
+		$commonServicesURL = $this->apiConfig['commonServicesURL'];
 		$commonApiVersion = $this->apiConfig['commonApiVersion'];
 
-		if (!isset($commonApiUrl) || empty($commonApiUrl)) {
+		if (!isset($commonServicesURL) || empty($commonServicesURL)) {
 			return false;
 		}
 		$endpoint = $commonApiVersion . '/users/';
-		$url = $commonApiUrl . $endpoint . $username;
+		$url = $commonServicesURL . $endpoint . $username;
 
-		$token = $this->apiConfig['commonServiceToken'];
+		$token = $this->apiConfig['commonServicesToken'];
 		$headers = [
 			"Authorization: Bearer $token"
 		];
@@ -424,20 +430,20 @@ class UserService {
 	}
 
 	public function addUsernameToCommonDataStore(string $username) : void {
-		$commonApiUrl = $this->apiConfig['commonApiUrl'];
+		$commonServicesURL = $this->apiConfig['commonServicesURL'];
 		$commonApiVersion = $this->apiConfig['commonApiVersion'];
 
-		if (!isset($commonApiUrl) || empty($commonApiUrl)) {
+		if (!isset($commonServicesURL) || empty($commonServicesURL)) {
 			return;
 		}
 		$endpoint = $commonApiVersion . '/users/';
-		$url = $commonApiUrl . $endpoint ;
+		$url = $commonServicesURL . $endpoint ;
 		
 		$params = [
 			'username' => $username
 		];
 
-		$token = $this->apiConfig['commonServiceToken'];
+		$token = $this->apiConfig['commonServicesToken'];
 		$headers = [
 			"Authorization: Bearer $token"
 		];
diff --git a/scss/ecloud-accounts-userregistration.scss b/scss/ecloud-accounts-userregistration.scss
index 991c2c1186626ae69713918313911455411133a1..f7f9c14ba31715c7116384424c44d34fc6d292ec 100644
--- a/scss/ecloud-accounts-userregistration.scss
+++ b/scss/ecloud-accounts-userregistration.scss
@@ -27,9 +27,12 @@ html {
 	margin: 0 auto;
 }
 
-.password-group #password {
-	height: 58px !important;
+#registrationForm .password-group #password {
+	height: 62px;
 	margin-left: 0;
+	background-color: var(--input-background-color);
+	color: var(--color-main-text);
+	border: 1px solid #E6E8E9;
 }
 
 @media only screen and (max-width: 768px) {
diff --git a/src/signup/CaptchaForm.vue b/src/signup/CaptchaForm.vue
index b0720bd552dc03d8184c9c0544f279b9684c57cf..aa2eba487c258087f84d18eb27642e62b50eafc7 100644
--- a/src/signup/CaptchaForm.vue
+++ b/src/signup/CaptchaForm.vue
@@ -165,10 +165,10 @@ export default {
 	margin-top: 10px;
 	margin-bottom: 10px;
 }
-#fields input {
-	background-color: var(--color-secondary-element);
+#captchaForm #fields input {
+	background-color: var(--input-background-color);
 	margin-bottom: 0;
-	color: rgba(0, 0, 0, 0.8);
+	color: var(--color-main-text);
 	display: block;
 	width: 100%;
 	font-size: 16px;
diff --git a/src/signup/RecoveryEmailForm.vue b/src/signup/RecoveryEmailForm.vue
index 639bd36ac2d5d9621cf1cafb562d7ec9cda2f799..e1b832b446647af8ac6e7000e9c2eb8a6375741a 100644
--- a/src/signup/RecoveryEmailForm.vue
+++ b/src/signup/RecoveryEmailForm.vue
@@ -159,10 +159,10 @@ export default {
 	margin-bottom: 10px;
 }
 
-#fields input{
-	background-color: var(--color-secondary-element);
+#recoveryEmailForm #fields input{
+	background-color: var(--input-background-color);
 	margin-bottom: 0;
-	color: rgba(0, 0, 0, 0.8);
+	color: var(--color-main-text);
 	display: block;
 	width: 100%;
 	font-size: 16px;
diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue
index e9178c1ac15ab3bbdd76be0cab73bdf78480c823..2e475142cd86201bc0549ba2e157f6b31aeee22e 100644
--- a/src/signup/RegistrationForm.vue
+++ b/src/signup/RegistrationForm.vue
@@ -349,13 +349,15 @@ export default {
 .fields input#username {
 	width: 50%;
 }
-.fields input,
-.fields input[type="password"] {
-	background-color: var(--color-secondary-element);
+.fields input{
+	width: 100%;
+}
+#registrationForm .fields input,
+#registrationForm .fields input[type="password"] {
+	background-color: var(--input-background-color);
 	margin-bottom: 0;
-	color: rgba(0, 0, 0, 0.8);
+	color: var(--color-main-text);
 	display: block;
-	width: 100%;
 	font-size: 16px;
 	line-height: 1.3em;
 	transition: all 0.5s linear;