diff --git a/lua.go b/lua.go
index 49e20b9..5b6eb79 100644
--- a/lua.go
+++ b/lua.go
@@ -17,7 +17,7 @@ prompt(ansikit.format(
 ))
 `
 
-func LuaInit(confpath string) {
+func LuaInit() {
 	l = lua.NewState()
 
 	l.OpenLibs()
@@ -66,12 +66,12 @@ func LuaInit(confpath string) {
 				"Missing preload file, builtins may be missing.")
 		}
 	}
-
-	// Run config
+}
+func RunConfig(confpath string) {
 	if !interactive {
 		return
 	}
-	err = l.DoFile(confpath)
+	err := l.DoFile(confpath)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err,
 			"\nAn error has occured while loading your config! Falling back to minimal default config.\n")
@@ -84,7 +84,10 @@ func RunLogin() {
 	if _, err := os.Stat(homedir + "/.hprofile.lua"); os.IsNotExist(err) {
 		return
 	}
-	err = l.DoFile(homedir + "/.hprofile.lua")
+	if !login {
+		return
+	}
+	err := l.DoFile(homedir + "/.hprofile.lua")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err,
 			"\nAn error has occured while loading your login config!n")
diff --git a/main.go b/main.go
index 7e74260..00c856e 100644
--- a/main.go
+++ b/main.go
@@ -61,7 +61,7 @@ func main() {
 	}
 
 	// first arg, first character
-	if loginshflag || os.Args[0][0] == "-" {
+	if loginshflag || os.Args[0][0] == '-' {
 		login = true
 	}
 
@@ -100,8 +100,9 @@ func main() {
 	}
 
 	go HandleSignals()
-	LuaInit(*configflag)
+	LuaInit()
 	RunLogin()
+	RunConfig(*configflag)
 
 	readline.Completer = readline.FilenameCompleter
 	readline.LoadHistory(homedir + "/.hilbish-history")