diff --git a/lib/template.php b/lib/template.php
index 0d6776aa26..93adc35eca 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -206,9 +206,9 @@ class OC_TEMPLATE{
 				$page->assign('searchbox', $search->fetchPage());
 				// Add menu data
 				if( OC_GROUP::inGroup( $_SESSION["user_id"], "admin" )){
-					$page->assign( "settingsnavigation", OC_APP::getSettingsNavigation());
+					$page->assign( "adminnavigation", OC_APP::getAdminNavigation());
 				}
-				$page->assign( "adminnavigation", OC_APP::getAdminNavigation());
+				$page->assign( "settingsnavigation", OC_APP::getSettingsNavigation());
 			}
 			else
 			{
diff --git a/templates/layout.admin.php b/templates/layout.admin.php
index 541427f5d5..36b824639d 100644
--- a/templates/layout.admin.php
+++ b/templates/layout.admin.php
@@ -33,14 +33,16 @@
 							<?php endforeach; ?>
 						<?php endif; ?>
 					<?php endforeach; ?>
-					<?php foreach($_['adminnavigation'] as $entry):?>
-						<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
-						<?php if( sizeof( $entry["subnavigation"] )): ?>
-							<?php foreach($entry["subnavigation"] as $subentry):?>
-								<li><a style="background-color:#FF8800;" href="<?php echo $subentry['href']; ?>" title=""><?php echo $subentry['name'] ?></a></li>
-							<?php endforeach; ?>
-						<?php endif; ?>
-					<?php endforeach; ?>
+					<?php if(isset($_['adminnavigation'])):?>
+						<?php foreach($_['adminnavigation'] as $entry):?>
+							<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
+							<?php if( sizeof( $entry["subnavigation"] )): ?>
+								<?php foreach($entry["subnavigation"] as $subentry):?>
+									<li><a style="background-color:#FF8800;" href="<?php echo $subentry['href']; ?>" title=""><?php echo $subentry['name'] ?></a></li>
+								<?php endforeach; ?>
+							<?php endif; ?>
+						<?php endforeach; ?>
+					<?php endif; ?>
 				</ul>
 			</div>