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 4a2d91bc65..9de45ae5f5 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
@@ -30,7 +30,7 @@ public class AdminEditProjectIdeaPanel extends Panel {
Match match = model.getObject().getMatch();
if (match != null) {
- watsonPanel = new WatsonInfoPanel("mainPanel", match.getProjectIdea());
+ watsonPanel = new ManualWatsonPanel("mainPanel", model);
actionPanel = new ProjectIdeaActionPanel("mainPanel", new PropertyModel<Match>(model, "match"));
currentPanel = watsonPanel;
currentPanel.setOutputMarkupId(true);
diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/match/ManualWatsonPanel.html b/src/main/java/se/su/dsv/scipro/admin/panels/match/ManualWatsonPanel.html
new file mode 100644
index 0000000000..d6ce9e4227
--- /dev/null
+++ b/src/main/java/se/su/dsv/scipro/admin/panels/match/ManualWatsonPanel.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html
+ xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
+<body>
+ <wicket:panel>
+ <wicket:enclosure child="manual">
+ <div wicket:id="manual" class="append-bottom"></div>
+ <div wicket:id="watson"></div>
+ </wicket:enclosure>
+ </wicket:panel>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/match/ManualWatsonPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/match/ManualWatsonPanel.java
new file mode 100644
index 0000000000..7563fd8f90
--- /dev/null
+++ b/src/main/java/se/su/dsv/scipro/admin/panels/match/ManualWatsonPanel.java
@@ -0,0 +1,23 @@
+package se.su.dsv.scipro.admin.panels.match;
+
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
+
+import se.su.dsv.scipro.admin.panels.ManualMatchPanel;
+import se.su.dsv.scipro.match.dataobject.Match;
+import se.su.dsv.scipro.match.dataobject.ProjectIdea;
+import se.su.dsv.scipro.supervisor.panels.WatsonInfoPanel;
+
+public class ManualWatsonPanel extends Panel {
+
+ private static final long serialVersionUID = 1L;
+
+ public ManualWatsonPanel(String id, IModel<ProjectIdea> model) {
+ super(id);
+ if (model.getObject()!=null){
+ add(new ManualMatchPanel("manual", new PropertyModel<Match>(model, "match")));
+ add(new WatsonInfoPanel("watson", model.getObject().getMatch().getProjectIdea()));
+ }
+ }
+}