Issue 570

Fixed problems with button enablement after refresh