diff --git a/.gitignore b/.gitignore
index c2230d54..caaa71d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 server/composer.lock
 server/vendor
 .idea
-.jshintrc
\ No newline at end of file
+.jshintrc
+server/files/
+!server/files/.gitkeep
diff --git a/client/gulp/config.js b/client/gulp/config.js
index 86e35dc7..2525122c 100644
--- a/client/gulp/config.js
+++ b/client/gulp/config.js
@@ -2,7 +2,7 @@
 
 module.exports = {
 
-  'serverport': 3000,
+  'serverport': 3006,
 
   'scripts': {
     'src': './src/*.js',
diff --git a/client/src/app/App.js b/client/src/app/App.js
index 4faa9121..053fd186 100644
--- a/client/src/app/App.js
+++ b/client/src/app/App.js
@@ -64,12 +64,12 @@ class App extends React.Component {
             loggedInStaff: !_.includes(props.location.pathname, '/admin/panel') && props.session.logged && props.session.staff,
             loggedOutStaff: _.includes(props.location.pathname, '/admin/panel') && !props.session.logged
         };
-        
-        if(props.config['maintenance-mode'] === '1' && !_.includes(props.location.pathname, '/admin') && !_.includes(props.location.pathname, '/maintenance')) {
+
+        if(props.config['maintenance-mode'] && !_.includes(props.location.pathname, '/admin') && !_.includes(props.location.pathname, '/maintenance')) {
             history.push('/maintenance');
         }
 
-        if(props.config['maintenance-mode'] === '0' && _.includes(props.location.pathname, '/maintenance')) {
+        if(!props.config['maintenance-mode'] && _.includes(props.location.pathname, '/maintenance')) {
             history.push('/');
         }
 
@@ -139,4 +139,4 @@ export default connect((store) => {
         session: store.session,
         routing: store.routing
     };
-})(App);
\ No newline at end of file
+})(App);
diff --git a/client/src/lib-app/session-store.js b/client/src/lib-app/session-store.js
index 7d2c35eb..bfcf14cb 100644
--- a/client/src/lib-app/session-store.js
+++ b/client/src/lib-app/session-store.js
@@ -60,6 +60,7 @@ class SessionStore {
         this.setItem('registration', configs.registration);
         this.setItem('user-system-enabled', configs['user-system-enabled']);
         this.setItem('allow-attachments', configs['allow-attachments']);
+        this.setItem('maintenance-mode', configs['maintenance-mode']);
     }
 
     getConfigs() {
@@ -115,4 +116,4 @@ class SessionStore {
     }
 }
 
-export default new SessionStore();
\ No newline at end of file
+export default new SessionStore();