diff --git a/CHANGELOG b/CHANGELOG
index 6e3c827d2..4ac10f57c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 5.1.40
 --------------------------------------------------------------------------------
+- fix saving user data when language selection is turned of (Closes: #568)
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.39
diff --git a/op/op.EditUserData.php b/op/op.EditUserData.php
index 66b1b5327..fbea088de 100644
--- a/op/op.EditUserData.php
+++ b/op/op.EditUserData.php
@@ -46,7 +46,8 @@ if(!checkFormKey('edituserdata')) {
 $fullname = $_POST["fullname"];
 $email    = $_POST["email"];
 $comment  = $_POST["comment"];
-$language  = $_POST["language"];
+if(isset($_POST["language"]))
+	$language  = $_POST["language"];
 /* 'theme' won't be set, if themeselector is turned off */
 if(isset($_POST["theme"]))
 	$mytheme  = $_POST["theme"];
@@ -103,7 +104,7 @@ if ($user->getEmail() != $email)
 if ($user->getComment() != $comment)
 	$user->setComment($comment);
 
-if ($user->getLanguage() != $language)
+if (isset($language) && $user->getLanguage() != $language)
 	$user->setLanguage($language);
 
 if (isset($mytheme) && $user->getTheme() != $mytheme)