diff --git a/classes/components/SettingsComponent.php b/classes/components/SettingsComponent.php
index 2415333..e023ece 100644
--- a/classes/components/SettingsComponent.php
+++ b/classes/components/SettingsComponent.php
@@ -228,10 +228,10 @@ class SettingsComponents {
 		$obj = new SecuritySettings();
 
 		$obj->set_id($entry['ID']);
-		$obj->set_security_question_1($entry["question1"]);
-		$obj->set_security_answer_1($entry["reponse1"]);
-		$obj->set_security_question_2($entry["question2"]);
-		$obj->set_security_answer_2($entry["reponse2"]);
+		if($entry["question1"] != null) $obj->set_security_question_1($entry["question1"]);
+		if($entry["reponse1"] != null) $obj->set_security_answer_1($entry["reponse1"]);
+		if($entry["question2"] != null) $obj->set_security_question_2($entry["question2"]);
+		if($entry["reponse2"] != null) $obj->set_security_answer_2($entry["reponse2"]);
 
 		return $obj;