diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig
index 7c29a52920..7dde1e8bcc 100644
--- a/resources/views/partials/menu-sidebar.twig
+++ b/resources/views/partials/menu-sidebar.twig
@@ -136,12 +136,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('profile') }}">
+                <a class="{{ activeRouteStrict('profile.index') }}" href="{{ route('profile.index') }}"><i class="fa fa-user fa-fw"></i> {{ 'profile'|_ }}
+                </a>
+            </li>
             <li class="{{ activeRoutePartial('preferences') }}">
                 <a class="{{ activeRouteStrict('preferences.index') }}" href="{{ route('preferences.index') }}"><i
                             class="fa fa-gear fa-fw"></i> {{ 'preferences'|_ }}</a>
diff --git a/resources/views/profile/index.twig b/resources/views/profile/index.twig
index 4719bb4885..fa1e076841 100644
--- a/resources/views/profile/index.twig
+++ b/resources/views/profile/index.twig
@@ -6,10 +6,6 @@
 
 {% block content %}
 
-
-
-
-
     <div class="row">
         <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
             <div class="box box-primary">
@@ -20,15 +16,18 @@
                     <p>
                         {{ trans('firefly.user_id_is',{user: userId})|raw }}
                     </p>
+                    {% if not SANDSTORM %}
                     <ul>
                         <li><a href="{{ route('profile.change-email') }}">{{ 'change_your_email'|_ }}</a></li>
                         <li><a href="{{ route('profile.change-password') }}">{{ 'change_your_password'|_ }}</a></li>
                         <li><a class="text-danger" href="{{ route('profile.delete-account') }}">{{ 'delete_account'|_ }}</a></li>
                     </ul>
+                    {% endif %}
                 </div>
             </div>
         </div>
     </div>
+    {% if not SANDSTORM %}
     <div class="row">
         <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
             <div class="box box-primary">
@@ -53,7 +52,9 @@
             </div>
         </div>
     </div>
+    {% endif %}
 
+    {% if not SANDSTORM %}
     <div class="row">
         <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
             <div class="box box-primary">
@@ -84,6 +85,8 @@
             </div>
         </div>
     </div>
+    {% endif %}
+
     <div class="row">
         <div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
             <passport-clients></passport-clients>