Fix switch user and change port.
Merge pull request #2101 from jburel/modify-port

Modify port