diff --git a/INSTALL/mysql.sql b/INSTALL/mysql.sql
index 6bd956c..ed39991 100644
--- a/INSTALL/mysql.sql
+++ b/INSTALL/mysql.sql
@@ -19,10 +19,9 @@
 -- Table structure for table `alignment_tags`
 --
 
-DROP TABLE IF EXISTS `alignment_tags`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `alignment_tags` (
+CREATE TABLE IF NOT EXISTS `alignment_tags` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `alignment_id` int(10) unsigned NOT NULL,
   `tag_id` int(10) unsigned NOT NULL,
@@ -48,10 +47,9 @@ CREATE TABLE `alignment_tags` (
 -- Table structure for table `alignments`
 --
 
-DROP TABLE IF EXISTS `alignments`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `alignments` (
+CREATE TABLE IF NOT EXISTS `alignments` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `individual_id` int(10) unsigned NOT NULL,
   `organisation_id` int(10) unsigned NOT NULL,
@@ -68,10 +66,9 @@ CREATE TABLE `alignments` (
 -- Table structure for table `auth_keys`
 --
 
-DROP TABLE IF EXISTS `auth_keys`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `auth_keys` (
+CREATE TABLE IF NOT EXISTS `auth_keys` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uuid` varchar(40) COLLATE utf8mb4_unicode_ci NOT NULL,
   `authkey` varchar(72) CHARACTER SET ascii DEFAULT NULL,
@@ -94,10 +91,9 @@ CREATE TABLE `auth_keys` (
 -- Table structure for table `broods`
 --
 
-DROP TABLE IF EXISTS `broods`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `broods` (
+CREATE TABLE IF NOT EXISTS `broods` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uuid` varchar(40) CHARACTER SET ascii DEFAULT NULL,
   `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
@@ -122,10 +118,9 @@ CREATE TABLE `broods` (
 -- Table structure for table `encryption_keys`
 --
 
-DROP TABLE IF EXISTS `encryption_keys`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `encryption_keys` (
+CREATE TABLE IF NOT EXISTS `encryption_keys` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uuid` varchar(40) CHARACTER SET ascii DEFAULT NULL,
   `type` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
@@ -145,10 +140,9 @@ CREATE TABLE `encryption_keys` (
 -- Table structure for table `individual_encryption_keys`
 --
 
-DROP TABLE IF EXISTS `individual_encryption_keys`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `individual_encryption_keys` (
+CREATE TABLE IF NOT EXISTS `individual_encryption_keys` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `individual_id` int(10) unsigned NOT NULL,
   `encryption_key_id` int(10) unsigned NOT NULL,
@@ -168,10 +162,9 @@ CREATE TABLE `individual_encryption_keys` (
 -- Table structure for table `individuals`
 --
 
-DROP TABLE IF EXISTS `individuals`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `individuals` (
+CREATE TABLE IF NOT EXISTS `individuals` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uuid` varchar(40) CHARACTER SET ascii DEFAULT NULL,
   `email` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
@@ -190,8 +183,7 @@ CREATE TABLE `individuals` (
 -- Table structure for table `local_tools`
 --
 
-DROP TABLE IF EXISTS `local_tools`;
-CREATE TABLE `local_tools` (
+CREATE TABLE IF NOT EXISTS `local_tools` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
   `connector` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
@@ -207,10 +199,9 @@ CREATE TABLE `local_tools` (
 -- Table structure for table `organisation_encryption_keys`
 --
 
-DROP TABLE IF EXISTS `organisation_encryption_keys`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `organisation_encryption_keys` (
+CREATE TABLE IF NOT EXISTS `organisation_encryption_keys` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `organisation_id` int(10) unsigned NOT NULL,
   `encryption_key_id` int(10) unsigned NOT NULL,
@@ -226,10 +217,9 @@ CREATE TABLE `organisation_encryption_keys` (
 -- Table structure for table `organisations`
 --
 
-DROP TABLE IF EXISTS `organisations`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `organisations` (
+CREATE TABLE IF NOT EXISTS `organisations` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uuid` varchar(40) CHARACTER SET ascii DEFAULT NULL,
   `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
@@ -252,10 +242,9 @@ CREATE TABLE `organisations` (
 -- Table structure for table `roles`
 --
 
-DROP TABLE IF EXISTS `roles`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `roles` (
+CREATE TABLE IF NOT EXISTS `roles` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uuid` varchar(40) CHARACTER SET ascii DEFAULT NULL,
   `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
@@ -271,10 +260,9 @@ CREATE TABLE `roles` (
 -- Table structure for table `tags`
 --
 
-DROP TABLE IF EXISTS `tags`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `tags` (
+CREATE TABLE IF NOT EXISTS `tags` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
   `description` text COLLATE utf8mb4_unicode_ci,
@@ -288,10 +276,7 @@ CREATE TABLE `tags` (
 -- Table structure for table `users`
 --
 
-DROP TABLE IF EXISTS `users`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `users` (
+CREATE TABLE IF NOT EXISTS `users` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uuid` varchar(40) CHARACTER SET ascii DEFAULT NULL,
   `username` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
@@ -309,7 +294,7 @@ CREATE TABLE `users` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
-CREATE TABLE `sharing_groups` (
+CREATE TABLE IF NOT EXISTS `sharing_groups` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uuid` varchar(40) CHARACTER SET ascii DEFAULT NULL,
   `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
@@ -326,7 +311,7 @@ CREATE TABLE `sharing_groups` (
   KEY `name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
-CREATE TABLE `sgo` (
+CREATE TABLE IF NOT EXISTS `sgo` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `sharing_group_id` int(10) unsigned NOT NULL,
   `organisation_id` int(10) unsigned NOT NULL,
@@ -336,7 +321,7 @@ CREATE TABLE `sgo` (
   KEY `organisation_id` (`organisation_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
-CREATE TABLE `meta_fields` (
+CREATE TABLE IF NOT EXISTS `meta_fields` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `scope` varchar(191) NOT NULL,
   `parent_id` int(10) unsigned NOT NULL,
@@ -356,7 +341,7 @@ CREATE TABLE `meta_fields` (
   KEY `meta_template_field_id` (`meta_template_field_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
-CREATE TABLE `meta_templates` (
+CREATE TABLE IF NOT EXISTS `meta_templates` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `scope` varchar(191) NOT NULL,
   `name` varchar(191) NOT NULL,
@@ -376,7 +361,7 @@ CREATE TABLE `meta_templates` (
   KEY `uuid` (`uuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
-CREATE TABLE `meta_template_fields` (
+CREATE TABLE IF NOT EXISTS `meta_template_fields` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `field` varchar(191) NOT NULL,
   `type` varchar(191) NOT NULL,
@@ -405,10 +390,10 @@ CREATE TABLE IF NOT EXISTS `audit_logs` (
     `change` blob,
     PRIMARY KEY (`id`),
     KEY `user_id` (`user_id`),
-    KEY `ip` (`ip`),
+    KEY `request_ip` (`request_ip`),
     KEY `model` (`model`),
-    KEY `action` (`action`),
-    KEY `model_id` (`model_id`)
+    KEY `request_action` (`request_action`),
+    KEY `model_id` (`model_id`),
     KEY `created` (`created`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
diff --git a/config/Migrations/20211123152707_user_org.php b/config/Migrations/20211123152707_user_org.php
index a0772ef..d51fd1e 100644
--- a/config/Migrations/20211123152707_user_org.php
+++ b/config/Migrations/20211123152707_user_org.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-use Phinx\Migration\AbstractMigration;
+use Migrations\AbstractMigration;
 
 final class UserOrg extends AbstractMigration
 {
@@ -18,6 +18,7 @@ final class UserOrg extends AbstractMigration
      */
     public function change(): void
     {
+<<<<<<< HEAD
         $exists = $this->table('users')->hasColumn('organisation_id');
         if (!$exists) {
             $this->table('users')
@@ -30,6 +31,17 @@ final class UserOrg extends AbstractMigration
                 ->addIndex('organisation_id')
                 ->update();
         }
+=======
+        $alignments = $this->table('users')
+            ->addColumn('organisation_id', 'integer', [
+                'default' => null,
+                'null' => true,
+                'signed' => false,
+                'length' => 10
+            ])
+            ->addIndex('organisation_id')
+            ->update();
+>>>>>>> main
         $q1 = $this->getQueryBuilder();
         $org_id = $q1->select(['min(id)'])->from('organisations')->execute()->fetchAll()[0][0];
         if (!empty($org_id)) {
diff --git a/src/Model/Entity/Organisation.php b/src/Model/Entity/Organisation.php
index bc78378..6766963 100644
--- a/src/Model/Entity/Organisation.php
+++ b/src/Model/Entity/Organisation.php
@@ -10,10 +10,5 @@ class Organisation extends AppModel
     protected $_accessible = [
         '*' => true,
         'id' => false,
-        'uuid' => false,
-    ];
-
-    protected $_accessibleOnNew = [
-        'uuid' => true,
     ];
 }
diff --git a/src/Model/Table/OrganisationsTable.php b/src/Model/Table/OrganisationsTable.php
index d4a99b9..c56720e 100644
--- a/src/Model/Table/OrganisationsTable.php
+++ b/src/Model/Table/OrganisationsTable.php
@@ -11,13 +11,10 @@ class OrganisationsTable extends AppTable
 {
     public $metaFields = 'organisation';
 
-    protected $_accessible = [
-        'id' => false
-    ];
-
     public function initialize(array $config): void
     {
         parent::initialize($config);
+        $this->addBehavior('UUID');
         $this->addBehavior('Timestamp');
         $this->addBehavior('Tags.Tag');
         $this->addBehavior('AuditLog');
diff --git a/src/Model/Table/UsersTable.php b/src/Model/Table/UsersTable.php
index cb189aa..61f06b8 100644
--- a/src/Model/Table/UsersTable.php
+++ b/src/Model/Table/UsersTable.php
@@ -12,6 +12,7 @@ use \Cake\Http\Session;
 use Cake\Http\Client;
 use Cake\Utility\Security;
 use Cake\Core\Configure;
+use Cake\Utility\Text;
 
 class UsersTable extends AppTable
 {
@@ -96,15 +97,35 @@ class UsersTable extends AppTable
         return $rules;
     }
 
+    public function test()
+    {
+        $this->Roles = TableRegistry::get('Roles');
+        $role = $this->Roles->newEntity([
+            'name' => 'admin',
+            'perm_admin' => 1,
+            'perm_org_admin' => 1,
+            'perm_sync' => 1
+        ]);
+        $this->Roles->save($role);
+    }
+
     public function checkForNewInstance(): bool
     {
         if (empty($this->find()->first())) {
             $this->Roles = TableRegistry::get('Roles');
             $role = $this->Roles->newEntity([
                 'name' => 'admin',
-                'perm_admin' => 1
+                'perm_admin' => 1,
+                'perm_org_admin' => 1,
+                'perm_sync' => 1
             ]);
             $this->Roles->save($role);
+            $this->Organisations = TableRegistry::get('Organisations');
+            $organisation = $this->Organisations->newEntity([
+                'name' => 'default_organisation',
+                'uuid' => Text::uuid()
+            ]);
+            $this->Organisations->save($organisation);
             $this->Individuals = TableRegistry::get('Individuals');
             $individual = $this->Individuals->newEntity([
                 'email' => 'admin@admin.test',
@@ -116,6 +137,7 @@ class UsersTable extends AppTable
                 'username' => 'admin',
                 'password' => 'Password1234',
                 'individual_id' => $individual->id,
+                'organisation_id' => $organisation->id,
                 'role_id' => $role->id
             ]);
             $this->save($user);