diff --git a/pythonrewrite/plugins/volume_props/volume_properties.cs b/pythonrewrite/plugins/volume_props/volume_properties.cs
index 2c16063..a8d48f1 100644
--- a/pythonrewrite/plugins/volume_props/volume_properties.cs
+++ b/pythonrewrite/plugins/volume_props/volume_properties.cs
@@ -29,32 +29,35 @@
 	<tr><td></td><td></td><td></td></tr>
 
 
-	<?cs # password change is only possible if the volume is not mounted ?>
-	<tr><td colspan="3">
-		<h3><?cs var:html_escape(Lang.Plugins.volume_props.Title.ChangePassword) ?></h3>
-	</td></tr>
-	<?cs call:print_form_header("set_password", "plugins/volume_props") ?>
-		<tr>
-			<td align="right"><label for="old_pw"><?cs var:html_escape(Lang.Text.EnterCurrentPassword) ?>: </label></td>
-			<td><input type="password" name="old_pw" tabindex="20" size="15" id="old_pw" /></td>
-			<td></td>
-		</tr>
-		<tr>
-			<td align="right"><label for="new_pw"><?cs var:html_escape(Lang.Text.EnterNewPassword) ?>: </label></td>
-			<td><input type="password" name="new_pw" tabindex="21" size="15" id="new_pw" /></td>
-			<td></td>
-		</tr>
-		<tr>
-			<td align="right"><label for="new_pw2"><?cs var:html_escape(Lang.Text.EnterSamePassword) ?>: </label></td>
-			<td><input type="password" name="new_pw2" tabindex="22" size="15" id="new_pw2" /></td>
-			<td align="right">
-				<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
-				<input type="hidden" name="store" value="change_pw" />
-				<button type="submit" tabindex="23"><?cs var:html_escape(Lang.Plugins.volume_props.Button.ChangePassword) ?></button></p>
-			</td>
-		</tr>
-	</form>
-	<tr><td></td><td></td><td></td></tr>
+	<?cs # show password change form only for encrypted volumes ?>
+	<?cs if:Data.CurrentDisk.encryption ?>
+		<?cs # password change is only possible if the volume is not mounted ?>
+		<tr><td colspan="3">
+			<h3><?cs var:html_escape(Lang.Plugins.volume_props.Title.ChangePassword) ?></h3>
+		</td></tr>
+		<?cs call:print_form_header("set_password", "plugins/volume_props") ?>
+			<tr>
+				<td align="right"><label for="old_pw"><?cs var:html_escape(Lang.Text.EnterCurrentPassword) ?>: </label></td>
+				<td><input type="password" name="old_pw" tabindex="20" size="15" id="old_pw" /></td>
+				<td></td>
+			</tr>
+			<tr>
+				<td align="right"><label for="new_pw"><?cs var:html_escape(Lang.Text.EnterNewPassword) ?>: </label></td>
+				<td><input type="password" name="new_pw" tabindex="21" size="15" id="new_pw" /></td>
+				<td></td>
+			</tr>
+			<tr>
+				<td align="right"><label for="new_pw2"><?cs var:html_escape(Lang.Text.EnterSamePassword) ?>: </label></td>
+				<td><input type="password" name="new_pw2" tabindex="22" size="15" id="new_pw2" /></td>
+				<td align="right">
+					<input type="hidden" name="device" value="<?cs var:html_escape(Data.CurrentDisk.device) ?>" />
+					<input type="hidden" name="store" value="change_pw" />
+					<button type="submit" tabindex="23"><?cs var:html_escape(Lang.Plugins.volume_props.Button.ChangePassword) ?></button></p>
+				</td>
+			</tr>
+		</form>
+		<tr><td></td><td></td><td></td></tr>
+	<?cs /if ?>
 
 	</table>