diff --git a/js/components/ascribe_detail/edition_container.js b/js/components/ascribe_detail/edition_container.js
index 34775592..d70c0601 100644
--- a/js/components/ascribe_detail/edition_container.js
+++ b/js/components/ascribe_detail/edition_container.js
@@ -89,12 +89,15 @@ let EditionContainer = React.createClass({
 
     render() {
         const { edition, currentUser, coaMeta } = this.state;
+        const { actionPanelButtonListType, furtherDetailsType } = this.props;
+
         if (Object.keys(edition).length && edition.id && currentUser && currentUser.email) {
             setDocumentTitle([edition.artist_name, edition.title].join(', '));
+
             return (
                 <Edition
-                    actionPanelButtonListType={this.props.actionPanelButtonListType}
-                    furtherDetailsType={this.props.furtherDetailsType}
+                    actionPanelButtonListType={actionPanelButtonListType}
+                    furtherDetailsType={furtherDetailsType}
                     edition={edition}
                     coaError={coaMeta.err}
                     currentUser={currentUser}
diff --git a/js/components/coa_verify_container.js b/js/components/coa_verify_container.js
index 9e6ff4e8..6d0af0fa 100644
--- a/js/components/coa_verify_container.js
+++ b/js/components/coa_verify_container.js
@@ -17,13 +17,14 @@ import { setDocumentTitle } from '../utils/dom_utils';
 
 
 let CoaVerifyContainer = React.createClass({
-
     propTypes: {
         location: React.PropTypes.object
     },
 
     render() {
+        const { message, signature } = this.props.location.query;
         setDocumentTitle(getLangText('Verify your Certificate of Authenticity'));
+
         return (
             <div className="ascribe-login-wrapper">
                 <br/>
@@ -31,7 +32,9 @@ let CoaVerifyContainer = React.createClass({
                     {getLangText('Verify your Certificate of Authenticity')}
                 </div>
 
-                <CoaVerifyForm location={this.props.location}/>
+                <CoaVerifyForm
+                    message={message}
+                    signature={signature}/>
                 <br />
                 <br />
                     {getLangText('ascribe is using the following public key for verification')}:
@@ -52,7 +55,8 @@ let CoaVerifyContainer = React.createClass({
 
 let CoaVerifyForm = React.createClass({
     propTypes: {
-        location: React.PropTypes.object
+        message: React.PropTypes.string,
+        signature: React.PropTypes.string
     },
 
     handleSuccess(response){
@@ -64,7 +68,8 @@ let CoaVerifyForm = React.createClass({
     },
 
     render() {
-        const {message, signature} = this.props.location.query;
+        const { message, signature } = this.props;
+
         return (
             <div>
                 <Form