Took out redundant property setting and fix an evaluation
Implemented security protocol on the customer screen