Actually use dbport specified instead of going with default
Remove unused else
Merge branch 'ajette-dbports'