diff --git a/spsrv.go b/spsrv.go
index caf6ad3..141631e 100644
--- a/spsrv.go
+++ b/spsrv.go
@@ -209,6 +209,11 @@ func handleConnection(netConn net.Conn, conf *Config) {
 			if req.user != "" && (!conf.UserCGIEnable || !conf.UserDirEnable) {
 				break
 			}
+			if req.user != "" && req.filePath == "" {
+				// TODO: Refactor - ATM `path` would contain the current CGI file wanted
+				// But for hitting /~user/, req.filePath is NOT index.gmi
+				req.filePath = "index.gmi"
+			}
 			log.Println("Attempting CGI:", req.filePath)
 
 			ok := handleCGI(conf, req, cgiPath)