Merge pull request #508 from bhariharan/unstable

Make radio button setup overrideable
Do not hand out RestClient when a logout is in progress