Lraucy/fix basic auth handling