[ADDED] Server port unless it's behind SSL

Fixes #2246