diff --git a/application/controllers/users.php b/application/controllers/users.php
index a2eae6b..e5acb80 100644
--- a/application/controllers/users.php
+++ b/application/controllers/users.php
@@ -13,6 +13,7 @@ class Users extends MY_Controller {
 	 */
 	public function __construct() {
 		parent::__construct();
+		$this->load->library('form_validation');
 		$this->load->model('user');
 	}
 
@@ -28,6 +29,139 @@ class Users extends MY_Controller {
 	 * Allows admins to create a new user.
 	 */
 	public function create() {
+		$config = array(
+			array(
+				'field' => 'username',
+				'label' => 'lang:field_username',
+				'rules' => 'trim|required|min_length[4]|max_length[20]|unique[users.username]',
+			),
+			array(
+				'field' => 'password',
+				'label' => 'lang:field_password',
+				'rules' => 'required|min_length[6]|matches[password_confirm]',
+			),
+			array(
+				'field' => 'password_confirm',
+				'label' => 'lang:field_password_confirm',
+			),
+			array(
+				'field' => 'firstname',
+				'label' => 'lang:field_firstname',
+				'rules' => 'trim|required|max_length[50]',
+			),
+			array(
+				'field' => 'lastname',
+				'label' => 'lang:field_lastname',
+				'rules' => 'trim|required|max_length[50]',
+			),
+			array(
+				'field' => 'email',
+				'label' => 'lang:field_email',
+				'rules' => 'trim|required|valid_email',
+			),
+			array(
+				'field' => 'institution',
+				'label' => 'lang:field_institution',
+				'rules' => 'trim|max_length[100]',
+			),
+			array(
+				'field' => 'phone',
+				'label' => 'lang:field_phone',
+				'rules' => 'trim|regex_match[/^\+\d{2,4}\w\d{2,4}\w\d{3,10}+$/i]',
+			)
+		);
+		$this->form_validation->set_rules($config);
+
+		if ($this->form_validation->run() === true) {
+			$username = $this->input->post('username');
+
+			$data = array(
+				'firstname' => $this->input->post('firstname'),
+				'lastname' => $this->input->post('lastname'),
+				'institution' => $this->input->post('institution'),
+				'phone' => $this->input->post('phone')
+			);
+
+			if ($this->user->register($username, $this->input->post('password'), $this->input->post('email'), $data)) {
+				$this->messages->add("The user '" . $username . "' was created", 'success');
+				redirect('users', 201);
+			}
+		}
+
 		$this->load->view('admin/users/create');
 	}
+
+	/**
+	 * Allows admins to edit the specified user.
+	 *
+	 * @param integer $id
+	 */
+	public function edit($id = '') {
+		$user = $this->user->getUserByID($id);
+
+		if (!isset($user) || !is_array($user)){
+			show_404();
+		}
+
+		$config = array(
+			array(
+				'field' => 'firstname',
+				'label' => 'lang:field_firstname',
+				'rules' => 'trim|required|max_length[50]',
+			),
+			array(
+				'field' => 'lastname',
+				'label' => 'lang:field_lastname',
+				'rules' => 'trim|required|max_length[50]',
+			),
+			array(
+				'field' => 'email',
+				'label' => 'lang:field_email',
+				'rules' => 'trim|required|valid_email',
+			),
+			array(
+				'field' => 'institution',
+				'label' => 'lang:field_institution',
+				'rules' => 'trim|max_length[100]',
+			),
+			array(
+				'field' => 'phone',
+				'label' => 'lang:field_phone',
+				//'rules' => 'trim|regex_match[/^\+\d{2,4}\w\d{2,4}\w\d{3,10}+$/i]',
+			)
+		);
+		$this->form_validation->set_rules($config);
+
+		if ($this->form_validation->run() === true) {
+			$data = array(
+				'email' => $this->input->post('email'),
+				'firstname' => $this->input->post('firstname'),
+				'lastname' => $this->input->post('lastname'),
+				'institution' => $this->input->post('institution'),
+				'phone' => $this->input->post('phone')
+			);
+
+			if ($this->user->update($user['id'], $data)) {
+				$this->messages->add("The user '" . $user['username'] . "' was updated", 'success');
+				redirect('users', 200);
+			}
+		}
+
+		$this->load->view('admin/users/edit', array('user' => $user));
+	}
+
+	/**
+	 * Allows admins to delete the specified user.
+	 *
+	 * @param integer $id
+	 */
+	public function delete($id = '') {
+		if (!is_array($this->user->getUserByID())) {
+			show_404();
+		}
+
+		$this->user->delete($id);
+		$this->messages->add('The selected user was deleted', 'success');
+		redirect('users', 200);
+	}
 }
\ No newline at end of file
diff --git a/application/language/english/users_lang.php b/application/language/english/users_lang.php
index d9ee277..829211e 100644
--- a/application/language/english/users_lang.php
+++ b/application/language/english/users_lang.php
@@ -10,6 +10,16 @@ $lang['user_create'] = "Create new user";
 $lang['user_delete'] = "Delete";
 
 $lang['create_user'] = "Create a new user";
+$lang['edit_user'] = "Edit user";
+
+$lang['field_username'] = "Username";
+$lang['field_password'] = "Password";
+$lang['field_password_confirm'] = "Confirm password";
+$lang['field_firstname'] = "First name";
+$lang['field_lastname'] = "Last name";
+$lang['field_email'] = "Email address";
+$lang['field_institution'] = "Institution";
+$lang['field_phone'] = "Phone number";
 
 /* End of file users_lang.php */
 /* Location: ./application/language/english/users_lang.php */
diff --git a/application/models/user.php b/application/models/user.php
index 28fea9b..adc5024 100644
--- a/application/models/user.php
+++ b/application/models/user.php
@@ -350,9 +350,8 @@ class User extends CI_Model {
 	 * @return array
 	 */
 	public function getUserByID($id = false) {
-		// if no ID was passed use the current users ID
 		if (empty($id)) {
-			$id = $this->session->userdata('user_id');
+			return false;
 		}
 
 		$this->db->where('users.id', $id);
diff --git a/application/views/admin/users/create.php b/application/views/admin/users/create.php
index aa7810a..72fabd5 100644
--- a/application/views/admin/users/create.php
+++ b/application/views/admin/users/create.php
@@ -11,35 +11,43 @@
 			<h3>Required information</h3>
 			<ul>
 				<li>
-					<?=form_label("Username", 'username');?>
+					<?=form_label(lang('field_username'), 'username');?>
 					<div>
 						<input type="text" name="username" id="username" class="short text" value="<?=set_value('username');?>" />
 						<?=form_error('username')?>
 					</div>
+					<label class="note">Must be between 4 and 20 characters long</label>
 				</li>
 				<li>
-					<?=form_label("Password", 'password');?>
+					<?=form_label(lang('field_email'), 'email');?>
+					<div>
+						<input type="text" name="email" id="email" class="medium text" value="<?=set_value('email');?>" />
+						<?=form_error('email')?>
+					</div>
+				</li>
+				<li>
+					<?=form_label(lang('field_password'), 'password');?>
 					<div>
 						<input type="password" name="password" id="password" class="short text" />
 						<?=form_error('password')?>
 					</div>
 				</li>
 				<li>
-					<?=form_label("Confirm password", 'password2');?>
+					<?=form_label(lang('field_password_confirm'), 'password_confirm');?>
 					<div>
 						<input type="password" name="password_confirm" id="password_confirm" class="short text" />
 						<?=form_error('password_confirm')?>
 					</div>
 				</li>
 				<li>
-					<?=form_label("First name", 'firstname');?>
+					<?=form_label(lang('field_firstname'), 'firstname');?>
 					<div>
 						<input type="text" name="firstname" id="firstname" class="short text" value="<?=set_value('firstname');?>" />
 						<?=form_error('firstname')?>
 					</div>
 				</li>
 				<li>
-					<?=form_label("Last name", 'lastname');?>
+					<?=form_label(lang('field_lastname'), 'lastname');?>
 					<div>
 						<input type="text" name="lastname" id="lastname" class="short text" value="<?=set_value('lastname');?>" />
 						<?=form_error('lastname')?>
@@ -49,12 +57,20 @@
 			<h3>Optional information</h3>
 			<ul>
 				<li>
-					<?=form_label("Institution", 'institution');?>
+					<?=form_label(lang('field_institution'), 'institution');?>
 					<div>
 						<input type="text" name="institution" id="institution" class="medium text" value="<?=set_value('institution');?>" />
 						<?=form_error('institution')?>
 					</div>
 				</li>
+				<li>
+					<?=form_label(lang('field_phone'), 'phone');?>
+					<div>
+						<input type="text" name="phone" id="phone" class="short text" value="<?=set_value('phone');?>" />
+						<?=form_error('phone')?>
+					</div>
+					<label class="note">Example: +49 123 456789</label>
+				</li>
 				<li>
 					<?=form_label("Language", 'language');?>
 					<div>
diff --git a/application/views/admin/users/edit.php b/application/views/admin/users/edit.php
new file mode 100644
index 0000000..73664d9
--- /dev/null
+++ b/application/views/admin/users/edit.php
@@ -0,0 +1,67 @@
+<?php $this->load->view('header');?>
+
+<div id="content">
+
+	<div class="title">
+		<h2><?=lang('edit_user');?> '<?=$user['username'];?>'</h2>
+	</div>
+
+	<div class="box">
+		<form name="createUser" method="post" action="<?=site_url('users/edit/' . $user['id'])?>">
+			<h3>Required information</h3>
+			<ul>
+				<li>
+					<?=form_label(lang('field_email'), 'email');?>
+					<div>
+						<input type="text" name="email" id="email" class="medium text" value="<?=set_value('email', $user['email']);?>" />
+						<?=form_error('email')?>
+					</div>
+				</li>
+				<li>
+					<?=form_label(lang('field_firstname'), 'firstname');?>
+					<div>
+						<input type="text" name="firstname" id="firstname" class="short text" value="<?=set_value('firstname', $user['firstname']);?>" />
+						<?=form_error('firstname')?>
+					</div>
+				</li>
+				<li>
+					<?=form_label(lang('field_lastname'), 'lastname');?>
+					<div>
+						<input type="text" name="lastname" id="lastname" class="short text" value="<?=set_value('lastname', $user['lastname']);?>" />
+						<?=form_error('lastname')?>
+					</div>
+				</li>
+			</ul>
+			<h3>Optional information</h3>
+			<ul>
+				<li>
+					<?=form_label(lang('field_institution'), 'institution');?>
+					<div>
+						<input type="text" name="institution" id="institution" class="medium text" value="<?=set_value('institution', $user['institution']);?>" />
+						<?=form_error('institution')?>
+					</div>
+				</li>
+				<li>
+					<?=form_label(lang('field_phone'), 'phone');?>
+					<div>
+						<input type="text" name="phone" id="phone" class="short text" value="<?=set_value('phone', $user['phone']);?>" />
+						<?=form_error('phone')?>
+					</div>
+					<label class="note">Example: +49 123 456789</label>
+				</li>
+				<li>
+					<?=form_label("Language", 'language');?>
+					<div>
+						<?=form_dropdown('language', array('English'), null, 'id="language" class="drop"');?>
+						<?=form_error('language')?>
+					</div>
+				</li>
+			</ul>
+			<p>
+				<a class="button save" href="javascript:void(0);" onclick="$('form[name=createUser]').submit();">Speichern</a>
+			</p>
+		</form>
+	</div>
+</div>
+
+<?php $this->load->view('footer');?>
\ No newline at end of file