diff --git a/src/index.html b/src/index.html
index 5154e9204..e52859eb1 100755
--- a/src/index.html
+++ b/src/index.html
@@ -40,163 +40,177 @@
 
 </head>
 
-<body style="display:none">
-    <div id="topbar" class="topbar primary-bg-color-dark">
-        <div class="fr ln29">
-            <span class="time"></span>
-            <a target="_blank" id="contact-us" href="#">
-                <b>Contact Us</b>
-            </a>
-            <div class="languages no-translation">
-                <ul id="display_language">
-                    <li class="EN">
-                        <span class="world world-white"></span>
-                        <span class="language">English</span>
-                        <span class="nav-caret"></span>
-                    </li>
-                </ul>
-                <ul id="select_language">
-                    <li class="current">
-                        <span class="world world-black"></span>
-                        <span class="language">English</span>
-                        <span class="nav-caret"></span>
-                    </li>
-                </ul>
+<body>
+    <div id="loading_container" class="ui-widget mainContainer">
+        <div class="sk-spinner-container">
+            <div class="sk-spinner sk-spinner-wave">
+                <div class="sk-rect1"></div>
+                <div class="sk-rect2"></div>
+                <div class="sk-rect3"></div>
+                <div class="sk-rect4"></div>
+                <div class="sk-rect5"></div>
             </div>
         </div>
     </div>
-    <div id="header">
-        <div id="container">
-            <div class="logo-parent">
-                <a id="logo">
-                    <div class="logo">
-                        <div></div>
-                    </div>
-                    <div class="binary-logo-text">
-                        <div></div>
-                    </div>
+    <div id="main_container" style="display:none">
+        <div id="topbar" class="topbar primary-bg-color-dark">
+            <div class="fr ln29">
+                <span class="time"></span>
+                <a target="_blank" id="contact-us" href="#">
+                    <b>Contact Us</b>
                 </a>
+                <div class="languages no-translation">
+                    <ul id="display_language">
+                        <li class="EN">
+                            <span class="world world-white"></span>
+                            <span class="language">English</span>
+                            <span class="nav-caret"></span>
+                        </li>
+                    </ul>
+                    <ul id="select_language">
+                        <li class="current">
+                            <span class="world world-black"></span>
+                            <span class="language">English</span>
+                            <span class="nav-caret"></span>
+                        </li>
+                    </ul>
+                </div>
             </div>
         </div>
-    </div>
-    <div id='close_banner_container' class='container invisible'>
-        <div class='close_banner_text'>
-            <img class='close_banner_img' src="v<version>/images/banner/icon_left.png"/>
-            <div class='close_banner_text_wrapper'>
-                <h3>Binary.com is moving to Deriv on 30 November</h3>
-                <p>Start using Deriv with your Binary.com email and password.</p>
+        <div id="header">
+            <div id="container">
+                <div class="logo-parent">
+                    <a id="logo">
+                        <div class="logo">
+                            <div></div>
+                        </div>
+                        <div class="binary-logo-text">
+                            <div></div>
+                        </div>
+                    </a>
+                </div>
             </div>
         </div>
-        <div class='close_banner_btn'>
-            <a id='close_banner_btn_iom' target="_blank" href="#">Trade on Deriv</a>
-        </div>
-    </div>
-    <div id="content">
-        <div class="container">
-            <div class="text">
-                <h1>Welcome to WebTrader</h1>
-                <p class="paragraph">
-                    WebTrader is the platform that lets you trade and view multiple markets on one screen. Add dashboards and charts, and drag and drop them to create your own layout. Copy trades from successful traders and mirror their activity. 
-                </p>
-                <b>Customisable workspaces</b>
-                <p class="paragraph">
-                    Create multiple custom screens and save each one as a workspace that you can view instantly later. 
-                </p>
-                <b>Trade multiple markets</b>
-                <p class="paragraph">
-                    Trade a multitude of assets in forex, commodities, stock indices, and synthetic indices. 
-                </p>
-                <b>Add useful tools</b>
-                <p class="paragraph">
-                    Use tools like historical data and the asset index on the same screen to inform your trading strategy. 
-                </p>
-                <b>Copy trading</b>
-                <p class="paragraph--br">
-                    Replicate the trades of more experienced traders in your own account.
-                </p>
-               <button onclick="openTradingPage()">Start trading</button>
+        <div id='close_banner_container' class='container invisible'>
+            <div class='close_banner_text'>
+                <img class='close_banner_img' src="v<version>/images/banner/icon_left.png"/>
+                <div class='close_banner_text_wrapper'>
+                    <h3>Binary.com is moving to Deriv on 30 November</h3>
+                    <p>Start using Deriv with your Binary.com email and password.</p>
+                </div>
             </div>
-            <div class="img">
-               <img class="responsive" src="v<version>/images/webtrader.png">
+            <div class='close_banner_btn'>
+                <a id='close_banner_btn_iom' target="_blank" href="#">Trade on Deriv</a>
             </div>
         </div>
-    </div>
-    <footer class="footer primary-bg-color-dark" id='footer'>
-        <div class="footer__container">
-            <div class="footer__social-icons">
-                <a href="http://www.youtube.com/user/BinaryTradingVideos" target="_blank" rel="noopener noreferrer">
-                    <img class="responsive" alt="Youtube icon" src="v<version>/images/youtube.svg">
-                </a>
-                <a href="https://www.facebook.com/derivdotcom" target="_blank" rel="noopener noreferrer">
-                    <img class="responsive" alt="Facebook icon" src="v<version>/images/facebook.svg">
-                </a>
-                <a href="https://twitter.com/derivdotcom" target="_blank" rel="noopener noreferrer">
-                    <img class="responsive" alt="Twitter icon" src="v<version>/images/twitter.svg">
-                </a>
-                <a href="https://t.me/binarydotcom" target="_blank" rel="noopener noreferrer">
-                    <img class="responsive" alt="Telegram icon" src="v<version>/images/telegram.svg">
-                </a>
-                <a href="https://www.reddit.com/r/binarydotcom/" target="_blank" rel="noopener noreferrer">
-                    <img class="responsive" alt="Reddit icon" src="v<version>/images/reddit.svg">
-                </a>
-            </div>
-            <div id="footer-eu">
-                <div class="footer__regulatory-icons">
-                    <div class="iom_icon">
-                        <a href="http://www.gov.im/gambling/" target="_blank" rel="noopener noreferrer">
-                            <img class="responsive" alt="Isle of man logo" src="v<version>/images/isle-of-man.png">
-                        </a>
-                    </div>
-                    <div class="gamstop-lga-container">
-                        <div class="lga_icon">
-                            <a href="https://www.authorisation.mga.org.mt/verification.aspx?lang=EN&amp;company=a5fd1edc-d072-4c26-b0cd-ab3fa0f0cc40&amp;details=1"
-                                target="_blank" rel="noopener noreferrer">
-                                <img class="responsive" alt="MGA logo" src="v<version>/images/mga-logo-footer.svg">
-                            </a>
-                        </div>
-                        <div class="gamstop_icon">
-                            <a href="https://www.gamstop.co.uk/" target="_blank" rel="noopener noreferrer">
-                                <img class="responsive" alt="Gamstop logo" src="v<version>/images/gamstop.svg">
-                            </a>
-                        </div>
-                    </div>
-                    <div class="age-restriction"> 
-                        <img class="responsive" src="v<version>/images/18+.svg"/>
-                    </div>
+        <div id="content">
+            <div class="container">
+                <div class="text">
+                    <h1>Welcome to WebTrader</h1>
+                    <p class="paragraph">
+                        WebTrader is the platform that lets you trade and view multiple markets on one screen. Add dashboards and charts, and drag and drop them to create your own layout. Copy trades from successful traders and mirror their activity. 
+                    </p>
+                    <b>Customisable workspaces</b>
+                    <p class="paragraph">
+                        Create multiple custom screens and save each one as a workspace that you can view instantly later. 
+                    </p>
+                    <b>Trade multiple markets</b>
+                    <p class="paragraph">
+                        Trade a multitude of assets in forex, commodities, stock indices, and synthetic indices. 
+                    </p>
+                    <b>Add useful tools</b>
+                    <p class="paragraph">
+                        Use tools like historical data and the asset index on the same screen to inform your trading strategy. 
+                    </p>
+                    <b>Copy trading</b>
+                    <p class="paragraph--br">
+                        Replicate the trades of more experienced traders in your own account.
+                    </p>
+                   <button onclick="openTradingPage()">Start trading</button>
                 </div>
-                <div class="footer__text-container">
-                    <p class="p1"></p>
-                    <p class="p2"></p>
-                    <p class="p3 u-margin-bottom-small"></p>
-                    <p class="p4 about-binary"></p>
-                    <p class="p5"></p>
-                    <p class="p6"></p>
+                <div class="img">
+                   <img class="responsive" src="v<version>/images/webtrader.png">
                 </div>
             </div>
-            <div id="footer-non-eu">
-                <div class="footer__regulatory-icons">
-                    <a class="vanuatu-icon" href="https://www.vfsc.vu/" target="_blank" rel="noopener noreferrer">
-                        <img class="responsive" alt="Vanuatu logo" src="v<version>/images/vanuatu-logo.png">
+        </div>
+        <footer class="footer primary-bg-color-dark" id='footer'>
+            <div class="footer__container">
+                <div class="footer__social-icons">
+                    <a href="http://www.youtube.com/user/BinaryTradingVideos" target="_blank" rel="noopener noreferrer">
+                        <img class="responsive" alt="Youtube icon" src="v<version>/images/youtube.svg">
+                    </a>
+                    <a href="https://www.facebook.com/derivdotcom" target="_blank" rel="noopener noreferrer">
+                        <img class="responsive" alt="Facebook icon" src="v<version>/images/facebook.svg">
                     </a>
-                    <a class="bvi-icon" href="http://www.bvifsc.vg/" target="_blank" rel="noopener noreferrer">
-                        <img class="responsive" alt="BVI logo" src="v<version>/images/bvi.png">
+                    <a href="https://twitter.com/derivdotcom" target="_blank" rel="noopener noreferrer">
+                        <img class="responsive" alt="Twitter icon" src="v<version>/images/twitter.svg">
                     </a>
-                    <a class="labuan-icon" href="https://www.labuanibfc.com/" target="_blank" rel="noopener noreferrer">
-                        <img class="responsive" alt="Labuan FSA logo" src="v<version>/images/labuan_FSA.svg">
+                    <a href="https://t.me/binarydotcom" target="_blank" rel="noopener noreferrer">
+                        <img class="responsive" alt="Telegram icon" src="v<version>/images/telegram.svg">
                     </a>
+                    <a href="https://www.reddit.com/r/binarydotcom/" target="_blank" rel="noopener noreferrer">
+                        <img class="responsive" alt="Reddit icon" src="v<version>/images/reddit.svg">
+                    </a>
+                </div>
+                <div id="footer-eu">
+                    <div class="footer__regulatory-icons">
+                        <div class="iom_icon">
+                            <a href="http://www.gov.im/gambling/" target="_blank" rel="noopener noreferrer">
+                                <img class="responsive" alt="Isle of man logo" src="v<version>/images/isle-of-man.png">
+                            </a>
+                        </div>
+                        <div class="gamstop-lga-container">
+                            <div class="lga_icon">
+                                <a href="https://www.authorisation.mga.org.mt/verification.aspx?lang=EN&amp;company=a5fd1edc-d072-4c26-b0cd-ab3fa0f0cc40&amp;details=1"
+                                    target="_blank" rel="noopener noreferrer">
+                                    <img class="responsive" alt="MGA logo" src="v<version>/images/mga-logo-footer.svg">
+                                </a>
+                            </div>
+                            <div class="gamstop_icon">
+                                <a href="https://www.gamstop.co.uk/" target="_blank" rel="noopener noreferrer">
+                                    <img class="responsive" alt="Gamstop logo" src="v<version>/images/gamstop.svg">
+                                </a>
+                            </div>
+                        </div>
+                        <div class="age-restriction"> 
+                            <img class="responsive" src="v<version>/images/18+.svg"/>
+                        </div>
+                    </div>
+                    <div class="footer__text-container">
+                        <p class="p1"></p>
+                        <p class="p2"></p>
+                        <p class="p3 u-margin-bottom-small"></p>
+                        <p class="p4 about-binary"></p>
+                        <p class="p5"></p>
+                        <p class="p6"></p>
+                    </div>
                 </div>
-                <div class="footer__text-container">
-                    <p class="p1"></p>
-                    <p class="p2"></p>
-                    <p class="p3"></p>
-                    <fieldset>
-                        <legend>risk warning</legend>
-                        <p class="p4"></p>
-                    </fieldset>
+                <div id="footer-non-eu">
+                    <div class="footer__regulatory-icons">
+                        <a class="vanuatu-icon" href="https://www.vfsc.vu/" target="_blank" rel="noopener noreferrer">
+                            <img class="responsive" alt="Vanuatu logo" src="v<version>/images/vanuatu-logo.png">
+                        </a>
+                        <a class="bvi-icon" href="http://www.bvifsc.vg/" target="_blank" rel="noopener noreferrer">
+                            <img class="responsive" alt="BVI logo" src="v<version>/images/bvi.png">
+                        </a>
+                        <a class="labuan-icon" href="https://www.labuanibfc.com/" target="_blank" rel="noopener noreferrer">
+                            <img class="responsive" alt="Labuan FSA logo" src="v<version>/images/labuan_FSA.svg">
+                        </a>
+                    </div>
+                    <div class="footer__text-container">
+                        <p class="p1"></p>
+                        <p class="p2"></p>
+                        <p class="p3"></p>
+                        <fieldset>
+                            <legend>risk warning</legend>
+                            <p class="p4"></p>
+                        </fieldset>
+                    </div>
                 </div>
             </div>
-        </div>
-    </footer>
+        </footer>
+    </div>
+
 
     <!-- For accessing current app version from index.js -->
     <script> var VERSION = "v<version>/"; </script>
diff --git a/src/index.js b/src/index.js
index 4df4b98a6..69b65b451 100644
--- a/src/index.js
+++ b/src/index.js
@@ -31,12 +31,76 @@ function loadAppId(callback) {
     });
 }
 
+function getUrl() {
+    var server_url = localStorage.getItem('config.server_url') || 'frontend.binaryws.com';
+    return 'wss://' + server_url + '/websockets/v3';
+}
+
+function processRedirect(selected_language_name) {
+    loadAppId(function(err, app_id_json) {
+        var ip_country;
+        var account_list;
+        var token = local_storage.get('oauth')[0].token;
+        var app_id = err ? default_app_id : getAppId(app_id_json);
+        var api_url = getUrl() + '?l=' + selected_language_name + '&app_id=' + app_id;
+        var ws = new WebSocket(api_url);
+        ws.onopen = sendWebsiteStatus;
+        ws.onmessage = processApiResponse;
+
+        function getAppId(app_id_json) {
+            var stored_app_id = '';
+
+            for(var url in app_id_json) {
+                if(href.lastIndexOf(url, 0) === 0) {
+                    stored_app_id = app_id_json[url];
+                }
+            }
+
+            return stored_app_id || default_app_id;
+        }
+        getUrl();
+
+        function sendApiRequest(request) {
+            ws.send(JSON.stringify(request));
+        }
+
+        function sendWebsiteStatus(evt) {
+            sendApiRequest({ website_status: 1 });
+        }
+
+        function sendAuthorize(token) {
+            sendApiRequest({ authorize: token });
+        }
+        
+        function processApiResponse(response) {
+            var data = JSON.parse(response.data);
+
+            if(data.website_status){
+                ip_country = data.website_status.clients_country;
+                sendAuthorize(token);
+
+            } else if (data.authorize){
+                const residence_country = data.authorize.country;
+                account_list = data.authorize.account_list
+                const has_mf = account_list.filter( item => item.landing_company_name === 'maltainvest').length;
+                if ((!isEuCountrySelected(ip_country) && has_mf) || (isEuCountrySelected(residence_country) && account_list.length == 1)){
+                    window.location.href = getBinaryUrl('move-to-deriv')
+                } else {
+                    window.location.href = VERSION + 'main.html';                    
+                }
+
+            }
+        }
+    })
+}
 function processPageLanguage() {
     populateLanguageDropdown();
 
     if (local_storage.get('oauth')) {
-        window.location.href = VERSION + 'main.html';
+        processRedirect();
     } else {
+        document.getElementById('loading_container').style.display="none"
+        document.getElementById('main_container').style.display="block"
         $(function () {
             $('body').css('display', 'block');
             setTime();
@@ -146,11 +210,7 @@ function processFooter(selected_language_name) {
             return stored_app_id || default_app_id;
         }
 
-        function getUrl() {
-            var server_url = localStorage.getItem('config.server_url') || 'frontend.binaryws.com';
-
-            return 'wss://' + server_url + '/websockets/v3';
-        }
+        getUrl();
 
         function sendApiRequest(request) {
             ws.send(JSON.stringify(request));
diff --git a/src/index.scss b/src/index.scss
index 6463f7413..4182c925a 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -209,3 +209,82 @@ body {
     }
   }
 }
+
+.sk-spinner-container {
+  width: 60px;
+  height: 60px;
+  position: fixed;
+  top: 0;
+  left: 0;
+  bottom: 60px;
+  right: 0;
+  margin: auto auto;
+  -webkit-user-select: none;
+  display: block;
+  margin: auto auto;
+}
+
+
+.sk-spinner-wave.sk-spinner {
+  margin: 0 auto;
+  width: 60px;
+  height: 30px;
+  text-align: center;
+  font-size: 10px;
+}
+
+.sk-spinner-wave div {
+  background-color: #333;
+  height: 100%;
+  width: 6px;
+  display: inline-block;
+  margin-right: 3px;
+  -webkit-animation: sk-waveStretchDelay 1.2s infinite ease-in-out;
+  animation: sk-waveStretchDelay 1.2s infinite ease-in-out;
+}
+
+.sk-spinner-wave .sk-rect2 {
+  -webkit-animation-delay: -1.1s;
+  animation-delay: -1.1s;
+}
+
+.sk-spinner-wave .sk-rect3 {
+  -webkit-animation-delay: -1s;
+  animation-delay: -1s;
+}
+
+.sk-spinner-wave .sk-rect4 {
+  -webkit-animation-delay: -0.9s;
+  animation-delay: -0.9s;
+}
+
+.sk-spinner-wave .sk-rect5 {
+  -webkit-animation-delay: -0.8s;
+  animation-delay: -0.8s;
+}
+
+@-webkit-keyframes sk-waveStretchDelay {
+  0%,
+  40%,
+  100% {
+      -webkit-transform: scaleY(0.4);
+      transform: scaleY(0.4);
+  }
+  20% {
+      -webkit-transform: scaleY(1);
+      transform: scaleY(1);
+  }
+}
+
+@keyframes sk-waveStretchDelay {
+  0%,
+  40%,
+  100% {
+      -webkit-transform: scaleY(0.4);
+      transform: scaleY(0.4);
+  }
+  20% {
+      -webkit-transform: scaleY(1);
+      transform: scaleY(1);
+  }
+}
