diff --git a/app/api/AutomationsApi.php b/app/api/AutomationsApi.php
index d95b3d6..4cecad5 100644
--- a/app/api/AutomationsApi.php
+++ b/app/api/AutomationsApi.php
@@ -26,8 +26,18 @@ class AutomationsApi extends ApiController
 		$this->requireAuth();
 		$obj = $this->input;
 
+		if (
+			empty($obj['name']) ||
+			!isset($obj['name']) ||
+			!isset($obj['conditions']) ||
+			!isset($obj['tasks']) ||
+			!isset($obj['days'])
+		) {
+			throw new Exception("Invalid request payload", 400);
+		}
+
 		$response = [];
-		$response = AutomationManager::create($obj['name'],$obj['days'], $obj['tasks'], $obj['conditions']);
+		$response = AutomationManager::create($obj['name'],json_encode($obj['days']), json_encode($obj['tasks']), json_encode($obj['conditions']));
 
 		$this->response(['value'=>'OK']);
 	}
diff --git a/app/models/managers/AutomationManager.php b/app/models/managers/AutomationManager.php
index ed5ef4c..2a06634 100644
--- a/app/models/managers/AutomationManager.php
+++ b/app/models/managers/AutomationManager.php
@@ -17,14 +17,14 @@ class AutomationManager{
 		return Db::command ('UPDATE automation SET executed = 0 WHERE automation_id=?', array ($automationId));
 	}
 
-	public static function create ($name, $onDays, $doCode, $ifCode, $automationId = "") {
-		$userId = UserManager::getUserData('user_id');
+	public static function create ($name, $onDays, $doCode, $ifCode, $userId = 1, $automationId = "") {
+		$userId = UserManager::getUserData('user_id', $userId);
 		$scene = array (
 			'name' => $name,
 			'owner_id' => $userId,
 			'on_days' => $onDays,
-			'if_something' => $ifCode,
-			'do_something' => $doCode,
+			'conditions' => $ifCode,
+			'tasks' => $doCode,
 		);
 		try {
 			if ($automationId == "") {
diff --git a/app/models/managers/SettingsManager.php b/app/models/managers/SettingsManager.php
index 2c34c69..1d350f9 100644
--- a/app/models/managers/SettingsManager.php
+++ b/app/models/managers/SettingsManager.php
@@ -14,7 +14,7 @@ class SettingsManager{
 	}
 
 	public static function create ($name, $value, $type = '') {
-		//if (!self::getByName($name)){
+		if (!self::getByName($name)){
 			$setting = array (
 				'name' => $name,
 				'value' => $value,
@@ -26,7 +26,7 @@ class SettingsManager{
 				echo $error->getMessage();
 				die();
 			}
-		//}
+		}
 	}
 
 	public static function update ($name, $value, $type = '') {