diff --git a/frontend/src/pages/activities_page.tsx b/frontend/src/pages/activities_page.tsx
index 7a438f2..45001ee 100644
--- a/frontend/src/pages/activities_page.tsx
+++ b/frontend/src/pages/activities_page.tsx
@@ -85,7 +85,7 @@ function ActivityCard({ activity }: { activity: Activity }) {
           <div>
             <img
               className={"object-contain max-h-52 mt-2 rounded-lg"}
-              src={network.getImageUrl(activity.resource.image.id)}
+              src={network.getResampledImageUrl(activity.resource.image.id)}
               alt={activity.resource.title}
             />
           </div>
diff --git a/server/service/image.go b/server/service/image.go
index b4447a5..232d17d 100644
--- a/server/service/image.go
+++ b/server/service/image.go
@@ -110,7 +110,11 @@ func CreateImage(uid uint, ip string, data []byte) (uint, error) {
 
 	// If the image is still too large after conversion, return an error
 	if len(data) > 1024*1024*4 {
-		return 0, model.NewRequestError("Image data is too large after conversion")
+		return 0, model.NewRequestError("Image data is too large")
+	}
+	// Normal user has a smaller upload limit
+	if !canUpload && len(data) > 1024*1024*2 {
+		return 0, model.NewRequestError("Image data is too large")
 	}
 
 	filename := uuid.New().String()