diff --git a/.travis.yml b/.travis.yml
index c0cc8ff1..faf1f4b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ services:
 
 env:
   global:
-     - VERSION=0.27.7
+     - VERSION=0.27.8
      - DB_HOST=localhost
      - DB_USER=travis
      - DB_PASS=
diff --git a/Dockerfile b/Dockerfile
index ab7fb5b6..8ff83539 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:latest
 
-ENV VERSION=v0.27.7
+ENV VERSION=v0.27.8
 
 RUN apk --no-cache add libstdc++ ca-certificates
 RUN wget -q https://github.com/hunterlong/statup/releases/download/$VERSION/statup-linux-alpine.tar.gz && \
diff --git a/handlers/index.go b/handlers/index.go
index 887b3367..88a8d90e 100644
--- a/handlers/index.go
+++ b/handlers/index.go
@@ -11,7 +11,7 @@ type index struct {
 }
 
 func IndexHandler(w http.ResponseWriter, r *http.Request) {
-	if core.CoreApp == nil {
+	if core.CoreApp.Services == nil {
 		http.Redirect(w, r, "/setup", http.StatusSeeOther)
 		return
 	}
diff --git a/handlers/setup.go b/handlers/setup.go
index c6f71e28..23109a90 100644
--- a/handlers/setup.go
+++ b/handlers/setup.go
@@ -11,7 +11,7 @@ import (
 )
 
 func SetupHandler(w http.ResponseWriter, r *http.Request) {
-	if core.CoreApp != nil {
+	if core.CoreApp.Services != nil {
 		http.Redirect(w, r, "/", http.StatusSeeOther)
 		return
 	}
@@ -39,7 +39,7 @@ func SetupHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func ProcessSetupHandler(w http.ResponseWriter, r *http.Request) {
-	if core.CoreApp != nil {
+	if core.CoreApp.Services != nil {
 		http.Redirect(w, r, "/", http.StatusSeeOther)
 		return
 	}
diff --git a/source/js/main.js b/source/js/main.js
index 008b54d5..84ccf638 100644
--- a/source/js/main.js
+++ b/source/js/main.js
@@ -6,13 +6,12 @@ $(".service_li").on('click', function() {
 });
 
 
-$(".disable_click").on('click', function() {
-    $(this).prop("disabled", true);
-    $(this).text("Loading...");
-    return true;
+$('form').submit(function() {
+    $(this).find("button[type='submit']").prop('disabled',true);
 });
 
 
+
 var ranVar = false;
 var ranTheme = false;
 $('a[data-toggle="pill"]').on('shown.bs.tab', function (e) {
diff --git a/source/js/setup.js b/source/js/setup.js
index e4aed7b6..1e35b068 100644
--- a/source/js/setup.js
+++ b/source/js/setup.js
@@ -23,3 +23,9 @@ $("#setup_form").submit(function() {
     $("#setup_button").text("Creating Statup...");
     return true;
 });
+
+
+$('form').submit(function() {
+    $(this).find("button[type='submit']").prop('disabled',true);
+    $(this).find("button[type='submit']").text('Loading...');
+});
\ No newline at end of file
diff --git a/source/tmpl/setup.html b/source/tmpl/setup.html
index f7b3cabd..88b33954 100644
--- a/source/tmpl/setup.html
+++ b/source/tmpl/setup.html
@@ -98,7 +98,7 @@
 
     </div>
 
-            <button id="setup_button" type="submit" class="btn btn-primary btn-block">Save Settings</button>
+            <button id="setup_button" type="submit" class="btn btn-primary btn-block disable_click">Save Settings</button>
 
     </div>