kindly merge. added student and password tempaltes