Cristian: work on Logon Module