diff --git a/app/templates/macros/topictable.html b/app/templates/macros/topictable.html
index 43324fa..a0c5b1e 100644
--- a/app/templates/macros/topictable.html
+++ b/app/templates/macros/topictable.html
@@ -18,7 +18,7 @@
 			<td>{{ topic.name or ""}}</td>
 			<td><a href="{{ topic.link }}">{{ topic.link | domain }}</a></td>
 			<td>
-				<a href="{{ url_for('create_edit_package_page', author=topic.author.username, repo=topic.getRepoURL(), forums=topic.topic_id, title=topic.title) }}">Create</a>
+				<a href="{{ url_for('create_edit_package_page', author=topic.author.username, repo=topic.getRepoURL(), forums=topic.topic_id, title=topic.title, bname=topic.name) }}">Create</a>
 			</td>
 		</tr>
 	{% endfor %}
diff --git a/app/views/packages/__init__.py b/app/views/packages/__init__.py
index a27c468..07f529b 100644
--- a/app/views/packages/__init__.py
+++ b/app/views/packages/__init__.py
@@ -182,8 +182,9 @@ def create_edit_package_page(author=None, name=None):
 	# Initial form class from post data and default data
 	if request.method == "GET":
 		if package is None:
-			form.repo.data   = request.args.get("repo")
+			form.name.data   = request.args.get("bname")
 			form.title.data  = request.args.get("title")
+			form.repo.data   = request.args.get("repo")
 			form.forums.data = request.args.get("forums")
 		else:
 			deps = package.dependencies