Added partial login support