Merge admin and user auth. ref #302