diff --git a/src/app.js b/src/app.js
index 45498b2..9efb5cd 100644
--- a/src/app.js
+++ b/src/app.js
@@ -121,8 +121,12 @@ class App extends React.Component {
               { pages.scenarios ? <Route exact path="/scenarios" component={Scenarios} /> : '' }
               { pages.scenarios ? <Route path="/scenarios/:scenario" component={Scenario} /> : '' }
               { pages.scenarios ? <Route path="/dashboards/:dashboard" component={Dashboard} /> : '' }
-              { pages.infrastructure ? <Route exact path="/infrastructure" component={InfrastructureComponents} /> : '' }
-              <Route path="/infrastructure/:ic" component={InfrastructureComponent} />
+              { currentUser.role === "Admin" || pages.infrastructure ?
+                <Route exact path="/infrastructure" component={InfrastructureComponents} />
+              : '' }
+              { currentUser.role === "Admin" || pages.infrastructure ?
+                <Route path="/infrastructure/:ic" component={InfrastructureComponent} />
+              : '' }
               { pages.account ? <Route path="/account" component={User} /> : '' }
               <Route path="/users" component={Users} />
               { pages.api ? <Route path="/api" component={APIBrowser} /> : '' }
diff --git a/src/common/menu.js b/src/common/menu.js
index 4dad81b..a647cc6 100644
--- a/src/common/menu.js
+++ b/src/common/menu.js
@@ -101,7 +101,9 @@ class SidebarMenu extends React.Component {
             : <ul>
               <li hidden={!values.pages.home}><NavLink to="/home" activeClassName="active" title="Home">Home</NavLink></li>
               <li hidden={!values.pages.scenarios}><NavLink to="/scenarios" activeClassName="active" title="Scenarios">Scenarios</NavLink></li>
-              <li hidden={!values.pages.infrastructure}><NavLink to="/infrastructure" activeClassName="active" title="Infrastructure">Infrastructure</NavLink></li>
+              {this.props.currentRole === 'Admin' || values.pages.infrastructure ?
+                <li><NavLink to="/infrastructure" activeClassName="active" title="Infrastructure">Infrastructure</NavLink></li> : ''
+              }
               {this.props.currentRole === 'Admin' ?
                 <li><NavLink to="/users" activeClassName="active" title="Users">Users</NavLink></li> : ''
               }