Hivesigner's role is to secure our private api via access token, so there should be simpler logical distinction, not radical changes to source code though. We can gradually improve that logic for sure. Please create issue to relevant source code, if you want to discuss further and easier to keep reference of issues and potential solution ideas on github. For mobile app side, issue created, referenced in earlier comment.