diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 465608481a5..a20f3989e43 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -167,6 +167,7 @@
 	var/icon_off = "camera_off"
 	var/size = 3
 	var/see_ghosts = 0 //for the spoop of it
+	var/current_photo_num = 1
 
 
 /obj/item/camera/spooky/CheckParts(list/parts_list)
@@ -386,7 +387,10 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
 	var/datum/picture/P = new()
 	if(istype(src,/obj/item/camera/digital))
 		P.fields["name"] = input(user,"Name photo:","photo")
-		P.name = P.fields["name"]//So the name is displayed on the print/delete list.
+		if(!P.fields["name"])
+			P.fields["name"] = "Photo [current_photo_num]"
+			current_photo_num++
+		P.name = P.fields["name"] //So the name is displayed on the print/delete list.
 	else
 		P.fields["name"] = "photo"
 	P.fields["author"] = user