diff --git a/routers/user/home.go b/routers/user/home.go
index 9421ee7d1..7d1f247ea 100755
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -145,13 +145,13 @@ func Dashboard(ctx *context.Context) {
 	ctx.Data["MirrorCount"] = len(mirrors)
 	ctx.Data["Mirrors"] = mirrors
 
-	retrieveFeeds(ctx, models.GetFeedsOptions{
-		RequestedUser:   ctxUser,
-		Actor:           ctx.User,
-		IncludePrivate:  true,
-		OnlyPerformedBy: false,
-		IncludeDeleted:  false,
-	})
+	//retrieveFeeds(ctx, models.GetFeedsOptions{
+	//	RequestedUser:   ctxUser,
+	//	Actor:           ctx.User,
+	//	IncludePrivate:  true,
+	//	OnlyPerformedBy: false,
+	//	IncludeDeleted:  false,
+	//})
 
 	if ctx.Written() {
 		return
diff --git a/routers/user/profile.go b/routers/user/profile.go
index 0fcc6453a..062adf0f7 100755
--- a/routers/user/profile.go
+++ b/routers/user/profile.go
@@ -178,10 +178,16 @@ func Profile(ctx *context.Context) {
 
 		total = ctxUser.NumFollowing
 	case "activity":
+		typeQuery := ctx.Query("type")
+		onlyPerformedBy := true
+		if typeQuery == "all" {
+			onlyPerformedBy = false
+		}
+		
 		retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser,
 			Actor:           ctx.User,
 			IncludePrivate:  showPrivate,
-			OnlyPerformedBy: true,
+			OnlyPerformedBy: onlyPerformedBy,
 			IncludeDeleted:  false,
 		})
 		if ctx.Written() {