diff --git a/.gitignore b/.gitignore
index 9c8cecf..2bc9773 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 *.sqlite
 /test.sql
 /vendor/
-/www/simplesaml
\ No newline at end of file
+/www/simplesaml
diff --git a/www/admin/aktiviteter/edit.php b/www/admin/aktiviteter/edit.php
index fcdc3e2..bc14ee4 100644
--- a/www/admin/aktiviteter/edit.php
+++ b/www/admin/aktiviteter/edit.php
@@ -5,6 +5,9 @@ setlocale(LC_ALL, 'no_NO');
 error_reporting(E_ALL);
 require __DIR__ . '/../../../src/_autoload.php';
 require __DIR__ . '/../../../sql_config.php';
+require_once(__DIR__ . '/../../../vendor/simplesamlphp/simplesamlphp/lib/_autoload.php');
+$as = new SimpleSAML_Auth_Simple('default-sp');
+$attrs = $as->getAttributes();
 $pdo = new \PDO($dbDsn, $dbUser, $dbPass);
 $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 $customActivity = new \pvv\side\DBActivity($pdo);
@@ -47,11 +50,25 @@ if($new == 0){
 <link rel="stylesheet" href="../../css/events.css">
 <link rel="stylesheet" href="../../css/admin.css">
 
-<nav><ul>
-	<li class="active"><a href="index.php">hjem</a></li>
-	<li><a href="aktiviteter/">aktiviteter</a></li>
-	<li><a href="kontakt">kontakt</a></li>
-	<li><a href="pvv/">wiki</a></li>
+<nav>
+	<ul>
+	<li><a href="../">hjem</a></li>
+	<li><a href="../kalender/">kalender</a></li>
+	<li><a href="../aktiviteter/">aktiviteter</a></li>
+	<li><a href="../prosjekt/">prosjekter</a></li>
+	<li><a href="../kontakt/">kontakt</a></li>
+	<li><a href="../pvv/">wiki</a></li>
+	</ul>
+
+	<?php
+		$attr = $as->getAttributes();
+		if($attr){
+			$uname = $attr["uid"][0];
+			echo '<p class="login">logget inn som: ' . $uname . '</p>';
+		}else{
+			echo '<a class="login" href="' . $as->getLoginURL() . '">logg inn</a>';
+		}
+	?>
 </nav>
 
 <header class="admin">Aktivitets&shy;administrasjon</header>
@@ -98,4 +115,4 @@ if($new == 0){
 	<p>
 </article>
 
-</main>
\ No newline at end of file
+</main>
diff --git a/www/admin/aktiviteter/index.php b/www/admin/aktiviteter/index.php
index 8300ab0..4c3a9ad 100644
--- a/www/admin/aktiviteter/index.php
+++ b/www/admin/aktiviteter/index.php
@@ -46,11 +46,12 @@ $events = array_values(array_filter(
 
 <nav>
 	<ul>
-	<li class="active"><a href="index.php">hjem</a></li>
-	<li><a href="aktiviteter/">aktiviteter</a></li>
-	<li><a href="../prosjekt/">prosjekter</a></li>
-	<li><a href="kontakt">kontakt</a></li>
-	<li><a href="pvv/">wiki</a></li>
+	<li><a href="../../index.php">hjem</a></li>
+	<li><a href="../../kalender/">kalender</a></li>
+	<li><a href="../../aktiviteter/">aktiviteter</a></li>
+	<li><a href="../../prosjekt/">prosjekter</a></li>
+	<li><a href="../../kontakt">kontakt</a></li>
+	<li><a href="../../pvv/">wiki</a></li>
 	</ul>
 
 	<?php
@@ -139,4 +140,4 @@ $events = array_values(array_filter(
 	</div>
 </article>
 
-</main>
\ No newline at end of file
+</main>
diff --git a/www/admin/prosjekter/edit.php b/www/admin/prosjekter/edit.php
index 639d8e2..75bd1cb 100644
--- a/www/admin/prosjekter/edit.php
+++ b/www/admin/prosjekter/edit.php
@@ -5,6 +5,9 @@ setlocale(LC_ALL, 'no_NO');
 error_reporting(E_ALL);
 require __DIR__ . '/../../../src/_autoload.php';
 require __DIR__ . '/../../../sql_config.php';
+require_once(__DIR__ . '/../../../vendor/simplesamlphp/simplesamlphp/lib/_autoload.php');
+$as = new SimpleSAML_Auth_Simple('default-sp');
+$attrs = $as->getAttributes();
 $pdo = new \PDO($dbDsn, $dbUser, $dbPass);
 $projectManager = new \pvv\side\ProjectManager($pdo);
 $projects = $projectManager->getAll();
@@ -41,11 +44,24 @@ if($new == 0){
 <link rel="stylesheet" href="../../css/events.css">
 <link rel="stylesheet" href="../../css/admin.css">
 
-<nav><ul>
+<nav>
+	<ul>
 	<li class="active"><a href="index.php">hjem</a></li>
 	<li><a href="aktiviteter/">aktiviteter</a></li>
+	<li><a href="../prosjekt/">prosjekter</a></li>
 	<li><a href="kontakt">kontakt</a></li>
 	<li><a href="pvv/">wiki</a></li>
+	</ul>
+
+	<?php
+		$attr = $as->getAttributes();
+		if($attr){
+			$uname = $attr["uid"][0];
+			echo '<p class="login">logget inn som: ' . $uname . '</p>';
+		}else{
+			echo '<a class="login" href="' . $as->getLoginURL() . '">logg inn</a>';
+		}
+	?>
 </nav>
 
 <header class="admin">Prosjekt&shy;administrasjon</header>
@@ -86,4 +102,4 @@ if($new == 0){
 	<p>
 </article>
 
-</main>
\ No newline at end of file
+</main>
diff --git a/www/admin/prosjekter/index.php b/www/admin/prosjekter/index.php
index 7f9b25b..aa64d11 100644
--- a/www/admin/prosjekter/index.php
+++ b/www/admin/prosjekter/index.php
@@ -135,4 +135,4 @@ $projects = array_values(array_filter(
 	</div>
 </article>
 
-</main>
\ No newline at end of file
+</main>