diff --git a/app/Http/Middleware/Sandstorm.php b/app/Http/Middleware/Sandstorm.php
index ff4093cede..92225ceef5 100644
--- a/app/Http/Middleware/Sandstorm.php
+++ b/app/Http/Middleware/Sandstorm.php
@@ -15,6 +15,7 @@ use Auth;
 use Closure;
 use FireflyIII\User;
 use Illuminate\Http\Request;
+use View;
 
 /**
  * Class Sandstorm
@@ -37,6 +38,7 @@ class Sandstorm
     {
         // is in Sandstorm environment?
         $sandstorm = intval(getenv('SANDSTORM')) === 1;
+        View::share('SANDSTORM', $sandstorm);
         if (!$sandstorm) {
             return $next($request);
         }
@@ -55,6 +57,7 @@ class Sandstorm
                             'password' => str_random(16),
                         ]
                     );
+
                 }
 
 
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index fc86a04dce..08f211925c 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -72,13 +72,13 @@
                         </span>
                     </li>
 
-                    <!-- Notifications: style can be found in dropdown.less -->
-                    <!-- User Account: style can be found in dropdown.less -->
+                    {% if not SANDSTORM %}
                     <li class="dropdown user user-menu">
                         <span style="cursor:default;color:#fff;padding: 15px;display: block;line-height: 20px;">
                             <span class="hidden-xs">{{ Auth.user.email }}</span>
                         </span>
                     </li>
+                    {% endif %}
                     <li id="sidebar-toggle">
                         <a href="#" data-toggle="control-sidebar"><i class="fa fa-plus-circle"></i></a>
                     </li>
diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig
index 8de86ca538..c5c6210177 100644
--- a/resources/views/partials/menu-sidebar.twig
+++ b/resources/views/partials/menu-sidebar.twig
@@ -136,6 +136,7 @@
     </li>
 
     <!-- options and preferences -->
+
     <li id="option-menu"
         class="{{ activeRoutePartial('admin') }} {{ activeRoutePartial('profile') }} {{ activeRoutePartial('preferences') }} {{ activeRoutePartial('currency') }} treeview">
         <a href="#">
@@ -147,9 +148,11 @@
         </a>
 
         <ul class="treeview-menu">
+            {% if not SANDSTORM %}
             <li class="{{ activeRoutePartial('profile') }}">
                 <a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}"><i class="fa fa-user fa-fw"></i> {{ 'profile'|_ }}</a>
             </li>
+            {% endif %}
             <li class="{{ activeRoutePartial('preferences') }}">
                 <a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}"><i class="fa fa-gear fa-fw"></i> {{ 'preferences'|_ }}</a>
             </li>
@@ -171,12 +174,12 @@
 
     <!-- other options -->
 
-
+    {% if not SANDSTORM %}
     <li>
         <a href="{{ route('logout') }}">
             <i class="fa fa-sign-out fa-fw"></i>
             <span>{{ 'logout'|_ }}</span>
         </a>
     </li>
-
+    {% endif %}
 </ul>