Authentication

#TKWC-1 fixed