Fixes to the first time initialisation script

app/Controller/UsersController.php

@@ -601,6 +601,7 @@ class UsersController extends AppController {
 					'type' => 'ADMIN',
 					'local' => 1
 				));
+				$this->User->Organisation->save($org);
 			}
 			// populate the DB with the first user if it's empty
 			if ($this->User->find('count') == 0 ) {

app/Model/User.php

@@ -137,8 +137,9 @@ class User extends AppModel {
 			),
 		),
 		'gpgkey' => array(
-			'valueNotEmpty' => array(
-				'rule' => array('valueNotEmpty'),
+			'gpgvalidation' => array(
+				'rule' => array('validateGpgkey'),
+				'message' => 'GPG key not valid, please enter a valid key.',
 			),
 		),
 		'nids_sid' => array(