diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index 04dd7e1a3..51881e939 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -182,11 +182,12 @@ foreach (dbFetch('SELECT `os` FROM `devices` AS D WHERE 1 GROUP BY `os` ORDER BY
 
 foreach (dbFetch('SELECT `version` FROM `devices` AS D WHERE 1 GROUP BY `version` ORDER BY `version`') as $data) {
     if ($data['version']) {
-        echo('"<option value=\"'.$data['version'].'\""+');
-        if ($data['version'] == $vars['version']) {
+        $tmp_version = str_replace(array("\r","\n"), "", $data['version']);
+        echo('"<option value=\"'.$tmp_version.'\""+');
+        if ($data['version'] == $tmp_version) {
             echo('" selected "+');
         }
-        echo('">'.$data['version'].'</option>"+');
+        echo('">'.$tmp_version.'</option>"+');
   }
 }
 ?>