diff --git a/app/config/core.php b/app/config/core.php
index a2b9c8b1..838e35e9 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -41,7 +41,7 @@ error_reporting(E_ALL & ~E_STRICT & ~E_DEPRECATED);
  * In production mode, flash messages redirect after a time interval.
  * In development mode, you need to click the flash message to continue.
  */
-Configure::write('debug', 1);
+Configure::write('debug', 0);
 
 Configure::write('version', '1.0.1');
 
diff --git a/app/controllers/documents_controller.php b/app/controllers/documents_controller.php
index 30428cec..ebaa36a4 100755
--- a/app/controllers/documents_controller.php
+++ b/app/controllers/documents_controller.php
@@ -17,8 +17,8 @@ class DocumentsController extends AppController {
 		$this->Document->recursive = 0;
 		//$this->set('documents', $this->paginate());
 
-    $query = "SELECT id,type,created,user_id,doc_page_count, pdf_filename,pdf_created_at, pdf_created_by_user_id FROM documents As Document ORDER BY id DESC;";
-    $this->set('documents', $this->Document->query($query));
+		$query = "SELECT id,type,created,user_id,doc_page_count, pdf_filename,pdf_created_at, pdf_created_by_user_id FROM documents As Document ORDER BY id DESC;";
+		$this->set('documents', $this->Document->query($query));
 
 		$this->set('users', $this->Document->User->getUsersList());
 	}
diff --git a/app/views/layouts/default.ctp b/app/views/layouts/default.ctp
index d9d1330c..20ca5f76 100755
--- a/app/views/layouts/default.ctp
+++ b/app/views/layouts/default.ctp
@@ -46,12 +46,9 @@ echo $scripts_for_layout;
 				<div id="username">
 
 <?php
-if (isset($currentuser) == FALSE) {
-	echo $html->link('Login', '/users/login');
-} else {
 	$logoutlink = $html->link('Logout', '/users/logout');
-	echo $html->link($currentuser['User']['username'], '/users/view/' . $currentuser['User']['id']) . ' (' . $logoutlink . ')';
-}
+	echo $html->link($currentuser['User']['username'], '/users/view/' . $currentuser['User']['id']);
+
 ?>
 				</div>