Attempt to fix problems in pundint authentication. Done at hackathon