Fixed #956: Bug - Infinite loop (Reseller UI)
Small fixes