diff --git a/dashboard/gulpfile.js b/dashboard/gulpfile.js
index c0d0439c8..3bc3bd0f1 100644
--- a/dashboard/gulpfile.js
+++ b/dashboard/gulpfile.js
@@ -113,11 +113,11 @@ gulp.task('js-setupaccount', function () {
         .pipe(gulp.dest('dist/js'));
 });
 
-gulp.task('js-setup', function () {
-    return gulp.src(['src/js/setup.js', 'src/js/client.js', 'src/js/utils.js'])
+gulp.task('js-activation', function () {
+    return gulp.src(['src/js/activation.js', 'src/js/client.js', 'src/js/utils.js'])
         .pipe(ejs({ apiOrigin: apiOrigin, revision: revision, appstore: appstore }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
-        .pipe(concat('setup.js', { newLine: ';' }))
+        .pipe(concat('activation.js', { newLine: ';' }))
         .pipe(sourcemaps.write())
         .pipe(gulp.dest('dist/js'));
 });
@@ -140,7 +140,7 @@ gulp.task('js-restore', function () {
         .pipe(gulp.dest('dist/js'));
 });
 
-gulp.task('js', gulp.series([ 'js-index', 'js-passwordreset', 'js-setupaccount', 'js-setup', 'js-setupdns', 'js-restore' ]));
+gulp.task('js', gulp.series([ 'js-index', 'js-passwordreset', 'js-setupaccount', 'js-activation', 'js-setupdns', 'js-restore' ]));
 
 // --------------
 // HTML
@@ -201,7 +201,7 @@ gulp.task('watch', function (done) {
     gulp.watch(['src/**/*.html'], gulp.series(['html']));
     gulp.watch(['src/views/*.html'], gulp.series(['html-views']));
     gulp.watch(['scripts/createTimezones.js', 'src/js/utils.js'], gulp.series(['timezones']));
-    gulp.watch(['src/js/setup.js', 'src/js/client.js', 'src/js/utils.js'], gulp.series(['js-setup']));
+    gulp.watch(['src/js/activation.js', 'src/js/client.js', 'src/js/utils.js'], gulp.series(['js-activation']));
     gulp.watch(['src/js/setupdns.js', 'src/js/client.js', 'src/js/utils.js'], gulp.series(['js-setupdns']));
     gulp.watch(['src/js/restore.js', 'src/js/client.js', 'src/js/utils.js'], gulp.series(['js-restore']));
     gulp.watch(['src/js/passwordreset.js', 'src/js/utils.js'], gulp.series(['js-passwordreset']));
diff --git a/dashboard/src/setup.html b/dashboard/src/activation.html
similarity index 99%
rename from dashboard/src/setup.html
rename to dashboard/src/activation.html
index 42dda4a7c..e1c4a9614 100644
--- a/dashboard/src/setup.html
+++ b/dashboard/src/activation.html
@@ -45,7 +45,7 @@
   <script type="text/javascript" src="/3rdparty/js/showdown-1.9.1.min.js?<%= revision %>"></script>
 
   <!-- Setup Application -->
-  <script type="text/javascript" src="/js/setup.js"></script>
+  <script type="text/javascript" src="/js/activation.js"></script>
 
 </head>
 
diff --git a/dashboard/src/js/setup.js b/dashboard/src/js/activation.js
similarity index 97%
rename from dashboard/src/js/setup.js
rename to dashboard/src/js/activation.js
index ffeba38d5..59ba852ae 100644
--- a/dashboard/src/js/setup.js
+++ b/dashboard/src/js/activation.js
@@ -77,9 +77,9 @@ app.controller('SetupController', ['$scope', 'Client', function ($scope, Client)
             return;
         }
 
-        // if we are here from https://ip/setup.html ,go to https://admin/setup.html
+        // if we are here from https://ip/activation.html ,go to https://admin/activation.html
         if (status.adminFqdn && status.adminFqdn !== window.location.hostname) {
-            window.location.href = 'https://' + status.adminFqdn + '/setup.html';
+            window.location.href = 'https://' + status.adminFqdn + '/activation.html';
             return true;
         }
 
diff --git a/dashboard/src/js/index.js b/dashboard/src/js/index.js
index cb0ecef70..710b85dc4 100644
--- a/dashboard/src/js/index.js
+++ b/dashboard/src/js/index.js
@@ -751,7 +751,7 @@ app.controller('MainController', ['$scope', '$route', '$timeout', '$location', '
             if (status.restore.active || status.restore.errorMessage) { // show the error message in restore page
                 window.location.href = '/restore.html' + window.location.search;
             } else if (status.adminFqdn) {
-                window.location.href = 'https://' + status.adminFqdn + '/setup.html' + (window.location.search);
+                window.location.href = 'https://' + status.adminFqdn + '/activation.html' + (window.location.search);
             } else {
                 window.location.href = '/setupdns.html' + window.location.search;
             }
diff --git a/dashboard/src/js/setupdns.js b/dashboard/src/js/setupdns.js
index da04176d1..272d9fef5 100644
--- a/dashboard/src/js/setupdns.js
+++ b/dashboard/src/js/setupdns.js
@@ -272,7 +272,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
                     $scope.state = 'initialized';
                     $scope.dnsCredentials.busy = false;
                 } else { // proceed to activation
-                    window.location.href = 'https://' + status.adminFqdn + '/setup.html' + (window.location.search);
+                    window.location.href = 'https://' + status.adminFqdn + '/activation.html' + (window.location.search);
                 }
                 return;
             }