Fix authentication module issues after merging the previously separate 2 ws modules