diff --git a/includes/database.class.php b/includes/database.class.php
index 42bc779e..3910c6ef 100644
--- a/includes/database.class.php
+++ b/includes/database.class.php
@@ -18,7 +18,7 @@ class DB
 
     private static function createConnectSyntax(&$options)
     {
-        return 'mysqli://'.urlencode($options['user']).':'.urlencode($options['pass']).'@'.$options['host'].'/'.$options['db'];
+        return 'mysqli://'.$options['user'].':'.$options['pass'].'@'.$options['host'].'/'.$options['db'];
     }
 
     public static function connect($idx)
diff --git a/template/pages/admin/screenshots.tpl.php b/template/pages/admin/screenshots.tpl.php
index 638099d1..de9527f8 100644
--- a/template/pages/admin/screenshots.tpl.php
+++ b/template/pages/admin/screenshots.tpl.php
@@ -31,8 +31,8 @@ endforeach;
 ?>
                             </select>
                         </td>
-                        <td>#<input type="number" size="5" id="pagetypeid"></td>
-                        <td>&raquo;&nbsp;<a href="#" onClick="ss_Manage(null, $('#pagetype').val(), $('#pagetypeid').val())">Search by Page</a></td>
+                        <td>#<input type="text" size="10" id="pagetypeid"></td>
+                        <td>&raquo;&nbsp;<a href="#" onClick="ss_Manage(null, $('#pagetype').val(), parseInt($('#pagetypeid').val()) || 0)">Search by Page</a></td>
                     </tr>
                 </table>
                 <hr />