Fix for subscription page navigation
Merge branch 'bolson'