#45 @LoginOnce applied to improve performance