diff --git a/application/language/english/settings_lang.php b/application/language/english/settings_lang.php
index efe937e..15e80bb 100644
--- a/application/language/english/settings_lang.php
+++ b/application/language/english/settings_lang.php
@@ -6,6 +6,7 @@ $lang['tab_settings'] = "Settings";
 
 $lang['projects_sortrecently'] = "Sort projects by date of the last access";
 $lang['projects_sortrecently_note'] = "If the projects are sorted by the data of the last access, the rarely used projects "slip" to the end of the list.";
+$lang['language_select'] = "Language";
 
 /* End of file settings_lang.php */
 /* Location: ./application/language/german/settings_lang.php */
diff --git a/application/language/german/settings_lang.php b/application/language/german/settings_lang.php
index 5a238d4..a7154c4 100644
--- a/application/language/german/settings_lang.php
+++ b/application/language/german/settings_lang.php
@@ -6,6 +6,7 @@ $lang['tab_settings'] = "Einstellungen";
 
 $lang['projects_sortrecently'] = "Projekte nach Zeitpunkt des letzten Zugriffs sortieren";
 $lang['projects_sortrecently_note'] = "Werden die Projekte nach dem Zeitpunkt des letzten Zugriffs sortiert, "rutschen" die selten verwendeten Projekte in der Liste nach unten.";
+$lang['language_select'] = "Sprache";
 
 /* End of file settings_lang.php */
 /* Location: ./application/language/german/settings_lang.php */
diff --git a/application/views/user/settings.php b/application/views/user/settings.php
index a8f5413..4351bb1 100644
--- a/application/views/user/settings.php
+++ b/application/views/user/settings.php
@@ -1,4 +1,4 @@
-<?php $this->load->view('header'); ?>
+<?php $this->load->view('header');?>
 
 <div id="content">
 	<form action="#" method="post">
@@ -13,20 +13,27 @@
 		<div class="tab_container">
 			<div id="personal" class="tab_content">
 				<ul>
-<?
-	foreach($profile_fields as $field):
-?>
+				<?php foreach($profile_fields as $field):?>
 					<li>
-						<h4><?=$field[1]?></h4>
-						<div><input type="<?=$field[2]?>" name="<?=$field[0]?>" class="short text" /></div>
+						<label><?=$field[1]?></label>
+						<div>
+						  <input type="<?=$field[2]?>" name="<?=$field[0]?>" class="short text" />
+						</div>
 					</li>
-<?
-	endforeach;
-?>
+				<?php endforeach;?>
 				</ul>
 			</div>
 			<div id="settings" class="tab_content">
 				<ul>
+					<li>
+						<label><?=lang('language_select');?></label>
+						<div>
+							<select id="language_select" name="language_select" class="drop">
+								<option value="de">Deutsch</option>
+								<option value="en">Englisch</option>
+							</select>
+						</div>
+					</li>
 					<li>
 						<input type="checkbox" id="projects_sortrecently" name="projects_sortrecently" value="1" class="checkbox"/>
 						<label for="projects_sortrecently"><?=lang('projects_sortrecently');?></label><br />