diff --git a/src/arenas/Battleship/public.php b/src/arenas/Battleship/public.php
index f62943a..7914490 100644
--- a/src/arenas/Battleship/public.php
+++ b/src/arenas/Battleship/public.php
@@ -31,7 +31,7 @@ if(!$postParams){
                         else
                             $selected='';
                         
-                        echo '<option value="'.$i."-".$bots[$i]['name'].'" '.$selected.'>'.$bots[$i]['name'].'</option>';
+                        echo '<option value="'.$bots[$i]['id']."-".htmlentities($bots[$i]['name']).'" '.$selected.'>'.htmlentities($bots[$i]['name']).'</option>';
                     }
                     ?>
                 </select>
@@ -44,7 +44,7 @@ if(!$postParams){
                         else
                             $selected='';
                             
-                        echo '<option value="'.$i."-".$bots[$i]['name'].'" '.$selected.'>'.$bots[$i]['name'].'</option>';
+                        echo '<option value="'.$bots[$i]['id']."-".htmlentities($bots[$i]['name']).'" '.$selected.'>'.htmlentities($bots[$i]['name']).'</option>';
                     }
                     ?>
                 </select></em>