diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java
index ece69828e..604a2f973 100644
--- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java
+++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java
@@ -80,14 +80,8 @@ public class AuthenticationService {
 			String passwordEncoded = login.get("password").getAsString();
 
 			byte[] decode = Base64.getDecoder().decode(passwordEncoded);
-			String passwordString;
-			if (login.has("encoding") && !login.get("encoding").getAsString().isEmpty()) {
-				passwordString = new String(decode, login.get("encoding").getAsString());
-			} else {
-				passwordString = new String(decode);
-			}
+			char[] password = new String(decode).toCharArray();
 
-			char[] password = passwordString.toCharArray();
 			if (password.length < 3) {
 				logger.error("Authentication failed: Password was not given or is too short!");
 				loginResult.addProperty("msg", MessageFormat.format("Could not log in due to: {0}",
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java
index dfa10fc5d..3d518a772 100644
--- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java
+++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/PrivilegeUsersService.java
@@ -280,12 +280,7 @@ public class PrivilegeUsersService {
 
 			String passwordEncoded = jsonObject.get("password").getAsString();
 			byte[] decode = Base64.getDecoder().decode(passwordEncoded);
-			String passwordString;
-			if (jsonObject.has("encoding") && !jsonObject.get("encoding").getAsString().isEmpty()) {
-				passwordString = new String(decode, jsonObject.get("encoding").getAsString());
-			} else {
-				passwordString = new String(decode);
-			}
+			String passwordString = new String(decode);
 
 			ServiceHandler svcHandler = RestfulStrolchComponent.getInstance().getComponent(ServiceHandler.class);
 			PrivilegeSetUserPasswordService svc = new PrivilegeSetUserPasswordService();