diff --git a/app/blueprints/packages/packages.py b/app/blueprints/packages/packages.py
index 4743a57..78aa35c 100644
--- a/app/blueprints/packages/packages.py
+++ b/app/blueprints/packages/packages.py
@@ -257,6 +257,7 @@ def create_edit(author=None, name=None):
 
 			package = Package()
 			package.author = author
+			package.maintainers.append(author)
 			wasNew = True
 
 		elif package.approved and package.name != form.name.data and \
@@ -428,7 +429,8 @@ def edit_maintainers(package):
 
 		package.maintainers.clear()
 		package.maintainers.extend(users)
-		package.maintainers.append(package.author)
+		if package.author not in package.maintainers:
+			package.maintainers.append(package.author)
 
 		msg = "Edited {} maintainers".format(package.title)
 		addNotification(package.author, current_user, msg, package.getDetailsURL(), package)
diff --git a/app/models.py b/app/models.py
index 58cf992..d508619 100644
--- a/app/models.py
+++ b/app/models.py
@@ -492,6 +492,8 @@ class Package(db.Model):
 		self.created_at = package.created_at
 		self.approved = package.approved
 
+		self.maintainers.append(self.author)
+
 		for e in PackagePropertyKey:
 			setattr(self, e.name, getattr(package, e.name))