diff --git a/htroot/ConfigLanguage_p.java b/htroot/ConfigLanguage_p.java
index 525701052..eff1be5b9 100644
--- a/htroot/ConfigLanguage_p.java
+++ b/htroot/ConfigLanguage_p.java
@@ -83,7 +83,7 @@ public class ConfigLanguage_p {
 	
 	if (post != null){
 		//change language
-		if(post.containsKey("use_button")){
+		if(post.containsKey("use_button") && (String)post.get("lang") != null){
 			translator.changeLang(env, langPath, (String)post.get("lang"));
 			
 		//delete language file
diff --git a/htroot/ConfigSkins_p.java b/htroot/ConfigSkins_p.java
index 00e0cccc3..98b5da4e8 100644
--- a/htroot/ConfigSkins_p.java
+++ b/htroot/ConfigSkins_p.java
@@ -112,7 +112,7 @@ public class ConfigSkins_p {
 	
 	if (post != null){
 		//change skin
-		if(post.containsKey("use_button")){
+		if(post.containsKey("use_button") && (String)post.get("skin") != null){
 			changeSkin(switchboard, skinPath, (String)post.get("skin"));
 			
 		//delete skin