diff --git a/api/controllers/startapp.go b/api/controllers/startapp.go
deleted file mode 100644
index c44da3a..0000000
--- a/api/controllers/startapp.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package controllers
-
-import (
-	"github.com/Redume/EveryNasa/api/utils"
-	"golang.org/x/sys/windows/registry"
-	"net/http"
-	"os"
-	"path"
-	"strings"
-)
-
-var AddStartApp = func(w http.ResponseWriter, r *http.Request) {
-	dir, err := os.Getwd()
-	if err != nil {
-		panic(err)
-	}
-	path := path.Join(dir, "EveryNasa.exe")
-
-	k, err := registry.OpenKey(registry.CURRENT_USER,
-		`SOFTWARE\Microsoft\Windows\CurrentVersion\Run`,
-		registry.QUERY_VALUE|registry.SET_VALUE)
-
-	if err != nil {
-		panic(err)
-	}
-
-	defer k.Close()
-
-	err = k.SetStringValue("EveryNasa", strings.Replace(path, "/", "\\", -1))
-	if err != nil {
-		panic(err)
-	}
-
-	utils.Respond(w, utils.Message(true, "EveryNasa was added to startup apps"))
-}
-
-var RemoveStartApp = func(w http.ResponseWriter, r *http.Request) {
-	k, err := registry.OpenKey(registry.CURRENT_USER,
-		`SOFTWARE\Microsoft\Windows\CurrentVersion\Run`,
-		registry.QUERY_VALUE|registry.SET_VALUE)
-
-	if err != nil {
-		panic(err)
-	}
-
-	defer k.Close()
-
-	err = k.DeleteValue("EveryNasa")
-	if err != nil {
-		panic(err)
-	}
-
-	utils.Respond(w, utils.Message(true, "EveryNasa was removed from startup apps"))
-}
diff --git a/api/controllers/startup.go b/api/controllers/startup.go
new file mode 100644
index 0000000..6c06163
--- /dev/null
+++ b/api/controllers/startup.go
@@ -0,0 +1,94 @@
+package controllers
+
+import (
+	"github.com/Redume/EveryNasa/api/utils"
+	"github.com/Redume/EveryNasa/functions"
+	"github.com/go-ole/go-ole"
+	"github.com/go-ole/go-ole/oleutil"
+	"net/http"
+	"os"
+	"os/user"
+	"strings"
+)
+
+var SetStartup = func(w http.ResponseWriter, r *http.Request) {
+	u, err := user.Current()
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	dir, err := os.Getwd()
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	dir = strings.Replace(dir, "\\", "\\\\", -1) + "\\EveryNasa.exe"
+
+	err = makeLnk(dir, strings.Replace(u.HomeDir, "\\", "\\\\", -1)+"\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\Startup\\EveryNasa.lnk")
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	utils.Respond(w, utils.Message(true, "The settings have been applied successfully."))
+}
+
+var RemoveStartup = func(w http.ResponseWriter, r *http.Request) {
+	u, err := user.Current()
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	err = os.Remove(strings.Replace(u.HomeDir, "\\", "\\\\", -1) + "\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\Startup\\EveryNasa.lnk")
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	utils.Respond(w, utils.Message(true, "The settings have been applied successfully."))
+}
+
+func makeLnk(src, dst string) error {
+	err := ole.CoInitializeEx(0, ole.COINIT_APARTMENTTHREADED|ole.COINIT_SPEED_OVER_MEMORY)
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	oleShellObject, err := oleutil.CreateObject("WScript.Shell")
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	defer oleShellObject.Release()
+	wshell, err := oleShellObject.QueryInterface(ole.IID_IDispatch)
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	defer wshell.Release()
+	cs, err := oleutil.CallMethod(wshell, "CreateShortcut", dst)
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	idispatch := cs.ToIDispatch()
+	_, err = oleutil.PutProperty(idispatch, "TargetPath", src)
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	dir, err := os.Getwd()
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	_, err = oleutil.PutProperty(idispatch, "WorkingDirectory", dir)
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	_, err = oleutil.CallMethod(idispatch, "Save")
+	if err != nil {
+		functions.Logger(err.Error())
+	}
+
+	return nil
+}