diff --git a/app/components/ens/registerSubDomain.js b/app/components/ens/registerSubDomain.js
index 8fe0ec2..a78ee11 100644
--- a/app/components/ens/registerSubDomain.js
+++ b/app/components/ens/registerSubDomain.js
@@ -16,6 +16,7 @@ const InnerForm = ({
   handleBlur,
   handleSubmit,
   isSubmitting,
+  setFieldValue
 }) => (
   <form onSubmit={handleSubmit}>
     <FieldGroup
@@ -46,6 +47,7 @@ const InnerForm = ({
       onBlur={handleBlur}
       value={values.address}
       error={errors.address}
+      button={<Button style={{ marginTop: '5px' }} onClick={() => setFieldValue('address', web3.eth.defaultAccount)}>Use My Primary Address</Button>}
     />
     <Button bsStyle="primary" type="submit" disabled={isSubmitting || !!Object.keys(errors).length}>{!isSubmitting ? 'Submit' : 'Submitting to the Blockchain - (this may take awhile)'}</Button>
   </form>
diff --git a/app/components/standard/FieldGroup.js b/app/components/standard/FieldGroup.js
index 675c922..61bb519 100644
--- a/app/components/standard/FieldGroup.js
+++ b/app/components/standard/FieldGroup.js
@@ -1,10 +1,18 @@
 import React from 'react';
-import { FormGroup, FormControl, HelpBlock, ControlLabel } from 'react-bootstrap';
+import { FormGroup, FormControl, HelpBlock, ControlLabel, InputGroup } from 'react-bootstrap';
 
-const FieldGroup = ({ id, label, error, ...props }) => (
+const FieldGroup = ({ id, label, button, error, ...props }) => (
   <FormGroup controlId={id} validationState={error ? 'error' : null}>
     <ControlLabel>{label}</ControlLabel>
-    <FormControl {...props} />
+    {button
+     ? <InputGroup>
+       <InputGroup.Button>
+         {button}
+       </InputGroup.Button>
+       <FormControl {...props} />
+     </InputGroup>
+     : <FormControl {...props} />
+    }
     {error && <HelpBlock>{error}</HelpBlock>}
   </FormGroup>
 )