Enhance serverstub and default credential behaviour