Revised login module with NAS, ver 3.2