fixed tfs# 119966 and 110706

fixed tfs# 119966 and 110706
fix for 110659  and110360

fix for 110659  and110360
code review comments

code review comments
Merge pull request #34 from MSOpenTech/near-expiry-password

Fixed UI related bugs