diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
index 46938c9bd3ebaeee51280004918287cbe8dc01b0..836dec4e5263e08412ccce70bdb80fd30c83f80d 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/PointOfInterestController.java
@@ -57,12 +57,11 @@ import no.nibio.web.forms.FormField;
 import no.nibio.web.forms.FormValidation;
 import no.nibio.web.forms.FormValidationException;
 import no.nibio.web.forms.FormValidator;
-import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URIBuilder;
 
 /**
  * Handles transactions for POIs
- * @copyright 2013-2015 <a href="http://www.nibio.no/">NIBIO</a>
+ * @copyright 2013-2019 <a href="http://www.nibio.no/">NIBIO</a>
  * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 public class PointOfInterestController extends HttpServlet {
diff --git a/src/main/webapp/templates/poiForm.ftl b/src/main/webapp/templates/poiForm.ftl
index 979d046f7cc3611d1c8c50d99f308daa1b4a3fc7..0ed6cab663e7a1f7f1a4831c9f5b139a5fa62aa6 100755
--- a/src/main/webapp/templates/poiForm.ftl
+++ b/src/main/webapp/templates/poiForm.ftl
@@ -188,6 +188,8 @@
 			     </select>
 			     <span class="help-block" id="${formId}_userId_validation"></span>
 			  </div>
+                          <#else>
+                            <input type="hidden" name="userId" value="${user.userId}"/>
 			  </#if>
 			  <button type="submit" class="btn btn-default">${i18nBundle.submit}</button>
 			  <#if poi.pointOfInterestId?has_content>