diff --git a/themes-default/legacy/views/config_general.mako b/themes-default/legacy/views/config_general.mako
index fcb511a284..f36880304a 100644
--- a/themes-default/legacy/views/config_general.mako
+++ b/themes-default/legacy/views/config_general.mako
@@ -724,9 +724,9 @@
                                     <select id="branchVersion" class="form-control form-control-inline input-sm pull-left">
                                     % if gh_branch:
                                         % for cur_branch in gh_branch:
-                                            % if app.GIT_USERNAME and app.GIT_PASSWORD and app.DEVELOPER == 1:
+                                            % if ((app.GIT_USERNAME and app.GIT_PASSWORD) or app.GIT_TOKEN) and app.DEVELOPER == 1:
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
-                                            % elif app.GIT_USERNAME and app.GIT_PASSWORD and cur_branch in ['master', 'develop']:
+                                            % elif ((app.GIT_USERNAME and app.GIT_PASSWORD) or app.GIT_TOKEN) and cur_branch in ['master', 'develop']:
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
                                             % elif cur_branch == 'master':
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
diff --git a/themes-default/slim/views/config_general.mako b/themes-default/slim/views/config_general.mako
index fcb511a284..f36880304a 100644
--- a/themes-default/slim/views/config_general.mako
+++ b/themes-default/slim/views/config_general.mako
@@ -724,9 +724,9 @@
                                     <select id="branchVersion" class="form-control form-control-inline input-sm pull-left">
                                     % if gh_branch:
                                         % for cur_branch in gh_branch:
-                                            % if app.GIT_USERNAME and app.GIT_PASSWORD and app.DEVELOPER == 1:
+                                            % if ((app.GIT_USERNAME and app.GIT_PASSWORD) or app.GIT_TOKEN) and app.DEVELOPER == 1:
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
-                                            % elif app.GIT_USERNAME and app.GIT_PASSWORD and cur_branch in ['master', 'develop']:
+                                            % elif ((app.GIT_USERNAME and app.GIT_PASSWORD) or app.GIT_TOKEN) and cur_branch in ['master', 'develop']:
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
                                             % elif cur_branch == 'master':
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
diff --git a/themes/dark/templates/config_general.mako b/themes/dark/templates/config_general.mako
index fcb511a284..f36880304a 100644
--- a/themes/dark/templates/config_general.mako
+++ b/themes/dark/templates/config_general.mako
@@ -724,9 +724,9 @@
                                     <select id="branchVersion" class="form-control form-control-inline input-sm pull-left">
                                     % if gh_branch:
                                         % for cur_branch in gh_branch:
-                                            % if app.GIT_USERNAME and app.GIT_PASSWORD and app.DEVELOPER == 1:
+                                            % if ((app.GIT_USERNAME and app.GIT_PASSWORD) or app.GIT_TOKEN) and app.DEVELOPER == 1:
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
-                                            % elif app.GIT_USERNAME and app.GIT_PASSWORD and cur_branch in ['master', 'develop']:
+                                            % elif ((app.GIT_USERNAME and app.GIT_PASSWORD) or app.GIT_TOKEN) and cur_branch in ['master', 'develop']:
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
                                             % elif cur_branch == 'master':
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
diff --git a/themes/legacy/templates/config_general.mako b/themes/legacy/templates/config_general.mako
index fcb511a284..f36880304a 100644
--- a/themes/legacy/templates/config_general.mako
+++ b/themes/legacy/templates/config_general.mako
@@ -724,9 +724,9 @@
                                     <select id="branchVersion" class="form-control form-control-inline input-sm pull-left">
                                     % if gh_branch:
                                         % for cur_branch in gh_branch:
-                                            % if app.GIT_USERNAME and app.GIT_PASSWORD and app.DEVELOPER == 1:
+                                            % if ((app.GIT_USERNAME and app.GIT_PASSWORD) or app.GIT_TOKEN) and app.DEVELOPER == 1:
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
-                                            % elif app.GIT_USERNAME and app.GIT_PASSWORD and cur_branch in ['master', 'develop']:
+                                            % elif ((app.GIT_USERNAME and app.GIT_PASSWORD) or app.GIT_TOKEN) and cur_branch in ['master', 'develop']:
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
                                             % elif cur_branch == 'master':
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
diff --git a/themes/light/templates/config_general.mako b/themes/light/templates/config_general.mako
index fcb511a284..f36880304a 100644
--- a/themes/light/templates/config_general.mako
+++ b/themes/light/templates/config_general.mako
@@ -724,9 +724,9 @@
                                     <select id="branchVersion" class="form-control form-control-inline input-sm pull-left">
                                     % if gh_branch:
                                         % for cur_branch in gh_branch:
-                                            % if app.GIT_USERNAME and app.GIT_PASSWORD and app.DEVELOPER == 1:
+                                            % if ((app.GIT_USERNAME and app.GIT_PASSWORD) or app.GIT_TOKEN) and app.DEVELOPER == 1:
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
-                                            % elif app.GIT_USERNAME and app.GIT_PASSWORD and cur_branch in ['master', 'develop']:
+                                            % elif ((app.GIT_USERNAME and app.GIT_PASSWORD) or app.GIT_TOKEN) and cur_branch in ['master', 'develop']:
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>
                                             % elif cur_branch == 'master':
                                                 <option value="${cur_branch}" ${'selected="selected"' if app.BRANCH == cur_branch else ''}>${cur_branch}</option>