diff --git a/resources/classes/schema.php b/resources/classes/schema.php
index b98f778206..be7f10dbb5 100644
--- a/resources/classes/schema.php
+++ b/resources/classes/schema.php
@@ -72,10 +72,10 @@ include "root.php";
 										else {
 											$sql .= $field['type'];
 										}
-										if ($field['key']['type'] == "primary") {
+										if ($field['key'] == "primary") {
 											$sql .= " PRIMARY KEY";
 										}
-										if ($field['key']['type'] == "foreign") {
+										if ($field['key'] == "foreign") {
 											if ($this->db_type == "pgsql") {
 												//$sql .= " references ".$field['key']['reference']['table']."(".$field['key']['reference']['field'].")";
 											}
diff --git a/resources/schema.php b/resources/schema.php
index 81df206858..3687065496 100644
--- a/resources/schema.php
+++ b/resources/schema.php
@@ -188,6 +188,9 @@ function db_create_table ($apps, $db_type, $table) {
 						else {
 							$sql .= $field['type'];
 						}
+						if ($field['key'] == "primary") {
+							$sql .= " PRIMARY KEY";
+						}
 						$field_count++;
 					}
 				}