diff --git a/application/controllers/api/v1/Person.php b/application/controllers/api/v1/Person.php
new file mode 100644
index 000000000..0ac0ba638
--- /dev/null
+++ b/application/controllers/api/v1/Person.php
@@ -0,0 +1,204 @@
+<?php
+
+/**
+ * FH-Complete
+ *
+ * @package		FHC-API
+ * @author		FHC-Team
+ * @copyright	Copyright (c) 2016, fhcomplete.org
+ * @license		GPLv3
+ * @link		http://fhcomplete.org
+ * @since		Version 1.0
+ * @filesource
+ */
+// ------------------------------------------------------------------------
+
+defined('BASEPATH') || exit('No direct script access allowed');
+
+class Person extends REST_Controller
+{
+
+    //public $session;
+    /**
+     * Person API constructor.
+     */
+    public function __construct()
+    {
+	parent::__construct();
+
+	$this->load->model('person/person_model');
+    }
+
+    public function person_get()
+    {
+	//if (!$this->session_model->validate($this->get('session_id'), $this->get('device_id')))
+	//    $this->response(array(['success' => false, 'message' => 'access denied']), REST_Controller::HTTP_UNAUTHORIZED);
+	
+	$code = $this->get('code');
+	$email = $this->get('email');
+	$person_id = $this->get('person_id');
+
+	if ((!is_null($code)) && (!is_null($email)))
+	{
+	    $result = $this->person_model->getPersonByCodeAndEmail($code, $email);
+	}
+	elseif (!is_null($person_id))
+	{
+	    $result = $this->person_model->getPerson($person_id);
+	}
+	else
+	{
+	    $result = $this->person_model->getPerson();
+	}
+
+	if (empty($result))
+	{
+	    $payload = [
+		'success' => false,
+		'message' => 'Person not found'
+	    ];
+	    $httpstatus = REST_Controller::HTTP_OK;
+	}
+	else
+	{
+	    // return all available persons
+	    $payload = [
+		'success' => true,
+		'message' => 'Persons found'
+	    ];
+	    $payload['data'] = $result;
+	    $httpstatus = REST_Controller::HTTP_OK;
+	}
+
+	// Set the response and exit
+	$this->response($payload, $httpstatus);
+    }
+    
+    public function personFromCode_post()
+    {
+	$code = $this->post('code');
+	$email = $this->post('email');
+	$person_id = $this->post('person_id');
+
+	if ((!is_null($code)) && (!is_null($email)))
+	{
+	    $result = $this->person_model->getPersonByCodeAndEmail($code, $email);
+	}
+	elseif (!is_null($person_id))
+	{
+	    $result = $this->person_model->getPerson($person_id);
+	}
+	else
+	{
+	    $result = $this->person_model->getPerson();
+	}
+
+	if (empty($result))
+	{
+	    $payload = [
+		'success' => false,
+		'message' => 'Person not found'
+	    ];
+	    $httpstatus = REST_Controller::HTTP_OK;
+	}
+	else
+	{
+	    // return all available persons
+	    $payload = [
+		'success' => true,
+		'message' => 'Persons found'
+	    ];
+	    $payload['data'] = $result;
+	    $httpstatus = REST_Controller::HTTP_OK;
+	}
+
+	// Set the response and exit
+	$this->response($payload, $httpstatus);
+    }
+    
+    public function person_post()
+    {
+	$result = $this->person_model->savePerson($this->post());
+	if($result != FALSE)
+	{
+	    $httpstatus = REST_Controller::HTTP_OK;
+	    $payload = [
+		'success' => true,
+		'message' => 'Person saved.'
+	    ];
+	    $payload['data'] = $result;
+	}
+	else
+	{
+	    $payload = [
+		'success' => false,
+		'message' => 'Could not save person.'
+	    ];
+	    $httpstatus = REST_Controller::HTTP_OK;
+	}
+	
+	$this->response($payload, $httpstatus);
+    }
+    
+    public function personUpdate_post()
+    {
+	$result = $this->person_model->updatePerson($this->post());
+	if($result != FALSE)
+	{
+	    $httpstatus = REST_Controller::HTTP_OK;
+	    $payload = [
+		'success' => true,
+		'message' => 'Person updated.'
+	    ];
+	    $payload['data'] = $result;
+	}
+	else
+	{
+	    $payload = [
+		'success' => false,
+		'message' => 'Could not update person.'
+	    ];
+	    $httpstatus = REST_Controller::HTTP_OK;
+	}
+//	
+	$this->response($payload, $httpstatus);
+    }
+    
+    public function checkBewerbung_get()
+    {
+	$result = $this->person_model->checkBewerbung($this->get("email"),$this->get("studiensemester_kurzbz"));
+	$httpstatus = REST_Controller::HTTP_OK;
+	$payload = [
+	    'success' => true,
+	    'message' => 'Bewerbung exists.'
+	];
+	$payload['data'] = $result;
+	
+	$this->response($payload, $httpstatus);
+    }
+    
+    public function checkZugangscodePerson_get()
+    {
+	$result = $this->person_model->checkZugangscodePerson($this->get("code"));
+	$httpstatus = REST_Controller::HTTP_OK;
+	if(!empty($result))
+	{
+	    $payload = [
+		'success' => true,
+		'message' => 'Zugangscode exists.'
+	    ];
+	    $payload['data'] = $result;
+	}
+	else
+	{
+	    $payload = [
+		'success' => false,
+		'message' => 'Zugangscode does not exist.'
+	    ];
+	    $httpstatus = REST_Controller::HTTP_OK;
+	}
+	
+	$this->response($payload, $httpstatus);
+    }
+
+}
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 83e33ad6d..827f48c84 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -19,24 +19,21 @@ class Person_model extends DB_Model
 		return $query->row_object();
     }
 
-	/**
-	 * Laedt Personendaten einer Person mittels Code
-	 * @param	string	$code	DB-Attr: tbl_benutzer.zugangscode .
-	 * @return	object
-	 */
-	public function getPersonByCode($code)
-	{
-		if($this->fhc_db_acl->bb->isBerechtigt('person','s'))
-		{
-			$query = $this->db->get_where('public.tbl_person', array('zugangscode' => $code));
-		    return $query->result_object();
-		}
-		else
-		{
-			return $this->_general_error($this->fhc_db_acl->bb->errormsg);
-			//return false;
-		}
-	}
+    public function getPersonByCodeAndEmail($code, $email)
+    {
+//	if ($this->fhc_db_acl->bb->isBerechtigt('person', 'suid'))
+//	{
+	    $this->db->select("*")
+		    ->from('public.tbl_person p')
+		    ->join("public.tbl_kontakt k", "k.person_id=p.person_id")
+		    ->where("p.zugangscode", $code)
+		    ->where("k.kontakt", $email);
+	    
+	    return $this->db->get()->result_object();
+//	    $query = $this->db->get_where('public.tbl_person p ', array('zugangscode' => $code));
+//	    return $query->result_object();
+//	}
+    }
 
     /**
      * Laedt Personendaten eine BenutzerUID
@@ -61,13 +58,14 @@ class Person_model extends DB_Model
 //	if($this->fhc_db_acl->bb->isBerechtigt('person', 'sui'))
 //	{
 	    $data = array(
-			"vorname"=>$person["vorname"],
-			"nachname"=>$person["nachname"],
-			"gebdatum"=>$person["gebdatum"],
-			"aktiv" => true,
-			"zugangscode"=>$person["zugangscode"],
-			"insertamum"=>date('Y-m-d H:i:s'),
-			"insertvon"=>$person["insertvon"],
+		"vorname"=>$person["vorname"],
+		"nachname"=>$person["nachname"],
+		"gebdatum"=>$person["gebdatum"],
+		"aktiv" => true,
+		"zugangscode"=>$person["zugangscode"],
+		"zugangscode_timestamp"=>date('Y-m-d H:i:s'),
+		"insertamum"=>date('Y-m-d H:i:s'),
+		"insertvon"=>$person["insertvon"],
 	    );
 	    if($this->db->insert("public.tbl_person", $data)){
 			return $this->db->insert_id();