Verizon Wireless in US has released a new update for its Samsung Galaxy S6 and S6 Edge sets to fix the Factory Reset issue when the device’s unlock password is forgotten.

Now, after the update, the device will enable factory reset only when you have tried the normal password for 10 times. After that, you get to try your backup password for five times. If that fails too, then only device will initiate factory reset.

The new software update is dubbed as build G920VVRU4CPF2 for Verizon Galaxy S6, and G925VVRU4CPF2 for S6 Edge. To update, go to Settings, and watch out for system update. You can also download the latest firmware available at the page below.