added (temporary) mercy for old accounts and fixed incorrect behaviour for secondary accounts