diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
index a11290b3..27c8193e 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
@@ -278,6 +278,7 @@
 
 <div id="commentForm" style="display:none">
     <form method="post" action="setMusicFileInfo.view">
+        <sec:csrfInput />
         <input type="hidden" name="action" value="comment">
         <input type="hidden" name="id" value="${model.dir.id}">
         <textarea name="comment" rows="6" cols="70">${model.dir.comment}</textarea>
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
index f843dac0..2fbb4fc8 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
@@ -208,6 +208,7 @@
 
 <div id="commentForm" style="display:none">
     <form method="post" action="setMusicFileInfo.view">
+        <sec:csrfInput />
         <input type="hidden" name="action" value="comment">
         <input type="hidden" name="id" value="${model.dir.id}">
         <textarea name="comment" rows="6" cols="70">${model.dir.comment}</textarea>
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp
index 6665cad1..08fd0bb4 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp
@@ -91,6 +91,7 @@
 <body class="mainframe bgcolor1" onload="search()">
 <h1><fmt:message key="changecoverart.title"/></h1>
 <form action="javascript:search()">
+    <sec:csrfInput />
     <table class="indent"><tr>
         <td><input id="artist" name="artist" placeholder="<fmt:message key="changecoverart.artist"/>" size="35" type="text" value="${model.artist}" onclick="select()"/></td>
         <td><input id="album" name="album" placeholder="<fmt:message key="changecoverart.album"/>" size="35" type="text" value="${model.album}" onclick="select()"/></td>
@@ -99,6 +100,7 @@
 </form>
 
 <form action="javascript:setImage(dwr.util.getValue('url'))">
+    <sec:csrfInput />
     <table><tr>
         <td><label for="url"><fmt:message key="changecoverart.address"/></label></td>
         <td style="padding-left:0.5em"><input type="text" name="url" size="50" id="url" value="http://" onclick="select()"/></td>
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/db.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/db.jsp
index 49be18b6..fb334593 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/db.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/db.jsp
@@ -7,6 +7,7 @@
 <h1>Database query</h1>
 
 <form method="post" action="db.view">
+    <sec:csrfInput />
     <textarea rows="10" cols="80" id="query" name="query" style="margin-top:1em">${model.query}</textarea>
     <input type="submit" value="<fmt:message key="common.ok"/>">
 </form>
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
index c4c10a47..ed7c511b 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
@@ -34,6 +34,7 @@
 </c:import>
 
 <form method="post" action="dlnaSettings.view">
+    <sec:csrfInput />
 
     <div>
         <input type="checkbox" name="dlnaEnabled" id="dlnaEnabled" class="checkbox"
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp
index 5c998c85..419f8bbe 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp
@@ -30,6 +30,7 @@
     <fmt:message key="importPlaylist.text"/>
 </div>
 <form method="post" enctype="multipart/form-data" action="importPlaylist.view">
+    <sec:csrfInput />
     <input type="file" id="file" name="file" size="40"/>
     <input type="submit" value="<fmt:message key="common.ok"/>"/>
 </form>
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
index 3684d9af..018aea97 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
@@ -12,6 +12,7 @@
 </c:import>
 
 <form method="post" action="internetRadioSettings.view">
+<sec:csrfInput />
 <table class="indent">
     <tr>
         <th><fmt:message key="internetradiosettings.name"/></th>
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
index 3a629974..f18cb442 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
@@ -122,6 +122,7 @@
     </h2>
 
     <form id="randomPlayQueue" method="post" action="randomPlayQueue.view?">
+        <sec:csrfInput />
         <table>
             <tr>
                 <td><fmt:message key="more.random.text"/></td>
@@ -291,6 +292,7 @@
     </h2>
 
     <form method="post" enctype="multipart/form-data" action="upload.view">
+        <sec:csrfInput />
         <table>
             <tr>
                 <td><fmt:message key="more.upload.source"/></td>
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
index 68814c86..5d9ed466 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
@@ -241,6 +241,7 @@
 </form:form>
 
 <form method="post" enctype="multipart/form-data" action="avatarUpload.view">
+    <sec:csrfInput />
     <table>
         <tr>
             <td style="padding-right:1em"><fmt:message key="personalsettings.avatar.changecustom"/></td>
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
index 667d571f..dbcdc7e7 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
@@ -8,6 +8,7 @@
 <body class="mainframe bgcolor1" onload="document.getElementById('usernameOrEmail').focus()">
 
 <form action="recover.view" method="POST">
+    <sec:csrfInput />
     <div class="bgcolor2 shadow" style="padding:20px 50px 20px 50px; margin-top:100px;margin-left:50px;margin-right:50px">
 
         <div style="margin-left: auto; margin-right: auto; width: 45em">
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
index 0431fd67..9cc317b5 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
@@ -14,6 +14,7 @@
 </c:import>
 
 <form method="post" action="shareSettings.view">
+    <sec:csrfInput />
 
     <table class="music indent">
         <tr>
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
index 5edef36d..976fd311 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
@@ -34,6 +34,7 @@
 </c:import>
 
 <form method="post" action="sonosSettings.view">
+    <sec:csrfInput />
 
     <div>
         <input type="checkbox" name="sonosEnabled" id="sonosEnabled" class="checkbox"
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/top.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
index 79629551..2b2d4980 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
@@ -125,6 +125,7 @@
 
         <td style="padding-left:1em">
             <form method="post" action="search.view" target="main" name="searchForm">
+                <sec:csrfInput />
                 <td><input type="text" name="query" id="query" size="28" placeholder="${search}" onclick="select();"
                            onkeyup="triggerInstantSearch();"></td>
                 <td><a href="javascript:document.searchForm.submit()"><img src="<spring:theme code="searchImage"/>" alt="${search}" title="${search}"></a></td>
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
index 1de70723..4cca1d00 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
@@ -14,6 +14,7 @@
 </c:import>
 
 <form method="post" action="transcodingSettings.view">
+<sec:csrfInput />
 <table class="indent">
     <tr>
         <th><fmt:message key="transcodingsettings.name"/></th>
