Issue 1058 fixed

Clear variables before success redirect