diff --git a/handlers/handlerpageedit.cpp b/handlers/handlerpageedit.cpp
index e2be89b..b0e3a5c 100644
--- a/handlers/handlerpageedit.cpp
+++ b/handlers/handlerpageedit.cpp
@@ -79,7 +79,15 @@ Response HandlerPageEdit::handleRequest(PageDao &pageDao, std::string pagename,
 				std::string visiblecmd = parser.extractCommand("visible", newContent);
 				std::string rename = parser.extractCommand("rename", newContent);
 				std::string customtitle = parser.extractCommand("pagetitle", newContent);
+				std::string parentpage = parser.extractCommand("parentpage", newContent);
 				std::vector<std::string> perms = parser.extractCommands("permissions", newContent);
+
+				if(parentpage != "" && !pageDao.find(parentpage))
+				{
+					return this->errorResponse("Invalid parent",
+											   "Specified parent page " + parentpage + " does not exist");
+				}
+
 				Page page;
 				std::optional<Page> currentPage = pageDao.find(pagename);
 				if(currentPage)
@@ -134,6 +142,7 @@ Response HandlerPageEdit::handleRequest(PageDao &pageDao, std::string pagename,
 				page.listed = !(visiblecmd == "0");
 				page.name = pagename;
 				page.title = customtitle;
+				page.parentpage = parentpage;
 				if(page.title.empty())
 				{
 					page.title = page.name;