diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/ManualSetReviewerPanel.html b/src/main/java/se/su/dsv/scipro/admin/panels/ManualSetReviewerPanel.html
index bd79b72bab..bd8ab09f97 100644
--- a/src/main/java/se/su/dsv/scipro/admin/panels/ManualSetReviewerPanel.html
+++ b/src/main/java/se/su/dsv/scipro/admin/panels/ManualSetReviewerPanel.html
@@ -5,11 +5,11 @@
 	<wicket:panel>
 		<div wicket:id="main"></div>
 		<wicket:fragment wicket:id="buttonFragment">
-			<button wicket:id="manualMatchButton">Match manually</button>
+			<button wicket:id="manualSetReviewerButton">Suggest reviewer</button>
    		</wicket:fragment>
-		<wicket:fragment wicket:id="matchFragment">
-  			<form wicket:id="matchForm">
-  				Supervisor: <div wicket:id="supervisorTextField"></div>
+		<wicket:fragment wicket:id="reviewerFragment">
+  			<form wicket:id="reviewerForm">
+  				Supervisor: <div wicket:id="reviewerTextField"></div>
   				<button type="submit" style="float: right;">Save</button>
   				<button wicket:id="cancelButton" style="float: right;">Cancel</button>
   			</form>
diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminEditProjectIdeaPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminEditProjectIdeaPanel.java
index 9de45ae5f5..5fdda5fad0 100644
--- a/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminEditProjectIdeaPanel.java
+++ b/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminEditProjectIdeaPanel.java
@@ -31,7 +31,7 @@ public class AdminEditProjectIdeaPanel extends Panel {
 		if (match != null) {
 
             watsonPanel = new ManualWatsonPanel("mainPanel", model);
-            actionPanel = new ProjectIdeaActionPanel("mainPanel", new PropertyModel<Match>(model, "match"));
+            actionPanel = new ProjectIdeaActionPanel("mainPanel", model);
             currentPanel = watsonPanel;
             currentPanel.setOutputMarkupId(true);
             watsonPanel.setOutputMarkupId(true);
diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.java
index 2788a1d13c..62c2820b97 100644
--- a/src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.java
+++ b/src/main/java/se/su/dsv/scipro/admin/panels/match/ProjectIdeaActionPanel.java
@@ -5,13 +5,17 @@ import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
 import se.su.dsv.scipro.SciProSession;
 import se.su.dsv.scipro.admin.panels.ManualMatchPanel;
+import se.su.dsv.scipro.admin.panels.ManualSetReviewerPanel;
 import se.su.dsv.scipro.match.dao.interfaces.MatchDao;
+import se.su.dsv.scipro.match.dao.interfaces.ProjectIdeaDao;
 import se.su.dsv.scipro.match.dataobject.Match;
 import se.su.dsv.scipro.match.dataobject.Match.Status;
+import se.su.dsv.scipro.match.dataobject.ProjectIdea;
 
 public class ProjectIdeaActionPanel extends Panel {
 
@@ -20,13 +24,16 @@ public class ProjectIdeaActionPanel extends Panel {
     @SpringBean
     private MatchDao matchDao;
     private ManualMatchPanel manualMatchPanel;
+    private ManualSetReviewerPanel manualSetReviewerPanel;
 
 
-    public ProjectIdeaActionPanel(String id, final IModel<Match> matchModel) {
-		super(id);
+    public ProjectIdeaActionPanel(String id, final IModel<ProjectIdea> projectIdeaModel) {
+        super(id);
+        final IModel<Match> matchModel = new PropertyModel<Match>(projectIdeaModel, "match");
 		add(new ProjectIdeaRemoveAuthorPanel("removeAuthorPanel", new Model(matchModel.getObject().getProjectIdea())).setVisible(matchModel.getObject().getProjectIdea().getAuthors().size()>1));
 		Form<Match> form = new Form<Match>("form", matchModel);
 		form.add(manualMatchPanel = new ManualMatchPanel("manualMatchPanel", matchModel));
+        form.add(manualSetReviewerPanel = new ManualSetReviewerPanel("manualSetReviewerPanel", projectIdeaModel));
 
 		form.add(new Button("sendBackButton") {
 			private static final long serialVersionUID = 1L;