diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
index ac38b74c..954d270f 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
@@ -21,7 +21,7 @@
     <c:param name="toast" value="${settings_toast}"/>
 </c:import>
 
-<form:form method="post" action="advancedSettings.view" commandName="command">
+<form:form method="post" action="advancedSettings.view" modelAttribute="command">
 
     <table style="white-space:nowrap" class="indent">
         <tr>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp
index 5bbe1335..ba5e49db 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp
@@ -35,7 +35,7 @@
     <c:param name="toast" value="${settings_toast}"/>
 </c:import>
 
-<form:form commandName="command" action="databaseSettings.view" method="post">
+<form:form modelAttribute="command" action="databaseSettings.view" method="post">
     <p><fmt:message key="databasesettings.moreinfo"/></p>
 
     <table style="white-space:nowrap" class="indent">
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
index 48e38e10..d512f380 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
@@ -16,7 +16,7 @@
     <c:param name="toast" value="${settings_toast}"/>
 </c:import>
 
-<form:form method="post" action="generalSettings.view" commandName="command">
+<form:form method="post" action="generalSettings.view" modelAttribute="command">
 
     <table style="white-space:nowrap" class="indent">
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
index a367437a..6cdfd3a9 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
@@ -28,7 +28,7 @@
     <c:param name="toast" value="${settings_toast}"/>
 </c:import>
 
-<form:form commandName="command" action="musicFolderSettings.view" method="post">
+<form:form modelAttribute="command" action="musicFolderSettings.view" method="post">
 
 <table class="indent">
     <tr>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp
index 533bf59b..3c4b6701 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp
@@ -22,7 +22,7 @@
     <c:otherwise>
         <fmt:message key="passwordsettings.title" var="title"><fmt:param>${command.username}</fmt:param></fmt:message>
         <h2>${fn:escapeXml(title)}</h2>
-        <form:form method="post" action="passwordSettings.view" commandName="command">
+        <form:form method="post" action="passwordSettings.view" modelAttribute="command">
             <form:hidden path="username"/>
             <table class="indent">
                 <tr>
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
index 843678ff..45d9ef80 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
@@ -27,7 +27,7 @@
 <h2>${fn:escapeXml(title)}</h2>
 
 <fmt:message key="common.default" var="defaultTitle"/>
-<form:form method="post" action="personalSettings.view" commandName="command">
+<form:form method="post" action="personalSettings.view" modelAttribute="command">
 
     <table style="white-space:nowrap" class="indent">
 
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
index 290081e7..ea766a96 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
@@ -77,7 +77,7 @@ $(document).ready(function() {
             </tr>
         </table>
 
-        <form:form commandName="command" method="post" action="playerSettings.view">
+        <form:form modelAttribute="command" method="post" action="playerSettings.view">
             <form:hidden path="playerId"/>
 
             <table class="ruleTable indent">
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp
index f4b4c439..c2e56211 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp
@@ -12,7 +12,7 @@
     <c:param name="toast" value="${settings_toast}"/>
 </c:import>
 
-<form:form commandName="command" action="podcastSettings.view" method="post">
+<form:form modelAttribute="command" action="podcastSettings.view" method="post">
 
 <table class="indent">
     <tr>