diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page
index ebf25aa0e..630213ae7 100644
--- a/plugins/dynamix/ArrayOperation.page
+++ b/plugins/dynamix/ArrayOperation.page
@@ -153,18 +153,15 @@ toggle_diskio(true);
 <?  if ($var['fsNumUnmountable']>0 && !file_exists($hide)):?>
       <tr>
       <td><strong>Unmountable disk<?=$var['fsNumUnmountable']==1?'':'s'?> present:</strong><br>
-<?    $verify = false;
-      $yesno = 'yes';
-      foreach ($disks as $disk) if (strpos($disk['fsStatus'],'Unmountable')!==false) {
-        echo "<br><span class='blue-text'>".my_disk($disk['name'])."</span> &bullet; ".my_id($disk['id'])." (".$disk['device'].")";
-        if (strpos($disk['fsStatus'],'Wrong')!==false) $verify = true; else $yesno = 'no';
-      }
+<?    foreach ($disks as $disk) if (strpos($disk['fsStatus'],'Unmountable')!==false)
+      echo "<span class='blue-text'>".my_disk($disk['name'])."</span> &bullet; ".my_id($disk['id'])." (".$disk['device'].")<br>";
 ?>    </td>
-<?    if ($verify):?>
-      <td><input type="button" id="cmdFormat" value="Format" disabled onclick="verify(this.form,'<?=$yesno?>')"><input type="hidden" name="unmountable_mask" value="<?=$var['fsUnmountableMask']?>"></td>
+<?    if ($var['fsNumWrongKey']>0):?>
+      <td><input type="button" id="cmdFormat" value="Format" disabled onclick="verify(this.form,'<?=$var['fsNumWrongKey']==$var['fsNumEncrypted']?'yes':'no'?>')">
 <?    else:?>
-      <td><input type="submit" id="cmdFormat" name="cmdFormat" value="Format" disabled><input type="hidden" name="unmountable_mask" value="<?=$var['fsUnmountableMask']?>"></td>
+      <td><input type="submit" id="cmdFormat" name="cmdFormat" value="Format" disabled>
 <?    endif;?>
+      <input type="hidden" name="unmountable_mask" value="<?=$var['fsUnmountableMask']?>"></td>
       <td><strong>Format</strong> will create a file system in all <strong>Unmountable</strong> disks, discarding all data currently on those disks.<br>
       <input type="checkbox" name="confirmFormat" value="OFF" onClick="$('#cmdFormat').prop('disabled',!arrayOps.confirmFormat.checked)"><small>Yes I want to do this</small></td>
       </tr>