diff --git a/internal/handlers/addFeedHandler.go b/internal/handlers/addFeedHandler.go
index 304fe60..7cbfb89 100644
--- a/internal/handlers/addFeedHandler.go
+++ b/internal/handlers/addFeedHandler.go
@@ -19,15 +19,11 @@ func AddFeedHandler(s *config.State, cmd config.Command, user database.User) err
 	}
 
 	ctx := context.Background()
-	user, err := s.DB.GetUser(ctx, s.Config.CurrentUserName)
-	if err != nil {
-		return err
-	}
 
 	name := cmd.Args[0]
 	url := cmd.Args[1]
 
-	_, err = rss.FetchFeed(ctx, url)
+	_, err := rss.FetchFeed(ctx, url)
 	if err != nil {
 		fmt.Printf("Failed to fetch feed: %v\n", err)
 		os.Exit(1)
diff --git a/internal/handlers/feedFollowsByUserHandler.go b/internal/handlers/feedFollowsByUserHandler.go
index c3d51f3..56a9adf 100644
--- a/internal/handlers/feedFollowsByUserHandler.go
+++ b/internal/handlers/feedFollowsByUserHandler.go
@@ -4,14 +4,11 @@ import (
 	"context"
 	"fmt"
 	"github.com/rdarius/boot-dev-blog-aggregator/internal/config"
+	"github.com/rdarius/boot-dev-blog-aggregator/internal/database"
 )
 
-func GetFeedFollowsByUserHandler(s *config.State, cmd config.Command) error {
+func GetFeedFollowsByUserHandler(s *config.State, cmd config.Command, user database.User) error {
 	ctx := context.Background()
-	user, err := s.DB.GetUser(ctx, s.Config.CurrentUserName)
-	if err != nil {
-		return err
-	}
 
 	ff, err := s.DB.GetFeedFollowsByUser(ctx, user.ID)
 
diff --git a/internal/handlers/followFeedHandler.go b/internal/handlers/followFeedHandler.go
index b7a69a8..4a962a5 100644
--- a/internal/handlers/followFeedHandler.go
+++ b/internal/handlers/followFeedHandler.go
@@ -12,15 +12,11 @@ import (
 	"time"
 )
 
-func FollowFeedHandler(s *config.State, cmd config.Command) error {
+func FollowFeedHandler(s *config.State, cmd config.Command, user database.User) error {
 	if len(cmd.Args) < 1 {
 		log.Fatal("usage: boot-dev-blog-aggregator follow URL")
 	}
 	ctx := context.Background()
-	user, err := s.DB.GetUser(ctx, s.Config.CurrentUserName)
-	if err != nil {
-		return err
-	}
 
 	url := cmd.Args[0]
 
diff --git a/main.go b/main.go
index 774987f..a35ac6d 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"database/sql"
 	_ "github.com/lib/pq"
 	"github.com/rdarius/boot-dev-blog-aggregator/internal/config"
@@ -36,10 +37,10 @@ func main() {
 	commands.Register("reset", handlers.ResetUsersHandler)
 	commands.Register("users", handlers.GetUsersHandler)
 	commands.Register("agg", handlers.FetchFeedHandler)
-	commands.Register("addfeed", handlers.AddFeedHandler)
+	commands.Register("addfeed", middlewareLoggedIn(handlers.AddFeedHandler))
 	commands.Register("feeds", handlers.ListFeedsHandler)
-	commands.Register("follow", handlers.FollowFeedHandler)
-	commands.Register("following", handlers.GetFeedFollowsByUserHandler)
+	commands.Register("follow", middlewareLoggedIn(handlers.FollowFeedHandler))
+	commands.Register("following", middlewareLoggedIn(handlers.GetFeedFollowsByUserHandler))
 
 	if len(os.Args) < 2 {
 		log.Fatal("usage: boot-dev-blog-aggregator <command> [args...]")
@@ -54,3 +55,13 @@ func main() {
 		log.Fatal(err)
 	}
 }
+
+func middlewareLoggedIn(handler func(s *config.State, cmd config.Command, user database.User) error) func(*config.State, config.Command) error {
+	return func(state *config.State, command config.Command) error {
+		user, err := state.DB.GetUser(context.Background(), state.Config.CurrentUserName)
+		if err != nil {
+			log.Fatal("user not logged in")
+		}
+		return handler(state, command, user)
+	}
+}