diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 1417d47..e2aa610 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -54,11 +54,7 @@ webserverStartAll()
     fi
 
     retval=0
-    if [ "$TOASTER_MANAGED" = '1' ]; then
-        python $BBBASEDIR/lib/toaster/manage.py syncdb || retval=1
-    else
-        python $BBBASEDIR/lib/toaster/manage.py syncdb --noinput || retval=1
-    fi
+    python $BBBASEDIR/lib/toaster/manage.py syncdb --noinput || retval=1
 
     if [ $retval -eq 1 ]; then
         echo "Failed db sync, aborting system start" 1>&2
@@ -183,7 +179,10 @@ RUNNING=0
 NOTOASTERUI=0
 WEBSERVER=1
 TOASTER_BRBE=""
-WEB_PORT="8000"
+if [ "WEB_PORT" == "" ]; then
+    WEB_PORT="8000"
+fi
+
 NOBROWSER=0
 
 for param in $*; do