diff --git a/apps/url-shortener/main.go b/apps/url-shortener/main.go
index b1db1f9..bb805e4 100644
--- a/apps/url-shortener/main.go
+++ b/apps/url-shortener/main.go
@@ -157,8 +157,11 @@
 }
 
 func getLoggedInUser(r *http.Request) (string, error) {
-	// TODO(dato): should make a request to get loggedin user
-	return "tabo", nil
+	if user := r.Header.Get("X-User"); user != "" {
+		return user, nil
+	} else {
+		return "", fmt.Errorf("unauthenticated")
+	}
 }
 
 type Server struct {