Avoid raising an exception when account does not exists
Merge branch 'fix-timezone-middleware' into develop