diff --git a/ext/admin/main.php b/ext/admin/main.php
index 35c6b5ef..b6e7bfb9 100644
--- a/ext/admin/main.php
+++ b/ext/admin/main.php
@@ -164,7 +164,7 @@ class AdminPage extends Extension {
 		global $page;
 
 		$matches = array();
-		preg_match("#^(?P<proto>\w+)\:(?:user=(?P<user>\w+)(?:;|$)|password=(?P<password>\w+)(?:;|$)|host=(?P<host>[\w\.\-]+)(?:;|$)|dbname=(?P<dbname>[\w_]+)(?:;|$))+#", DATABASE_DSN, $matches);
+		preg_match("#^(?P<proto>\w+)\:(?:user=(?P<user>\w+)(?:;|$)|password=(?P<password>\w*)(?:;|$)|host=(?P<host>[\w\.\-]+)(?:;|$)|dbname=(?P<dbname>[\w_]+)(?:;|$))+#", DATABASE_DSN, $matches);
 		$software = $matches['proto'];
 		$username = $matches['user'];
 		$password = $matches['password'];
@@ -184,6 +184,8 @@ class AdminPage extends Extension {
 				break;
 		}
 
+		//FIXME: .SQL dump is empty if cmd doesn't exist
+
 		$page->set_mode("data");
 		$page->set_type("application/x-unknown");
 		$page->set_filename('shimmie-'.date('Ymd').'.sql');