diff --git a/client/me/profile-links/creators.jsx b/client/me/profile-links/creators.jsx
deleted file mode 100644
index ef36bcd92aa5f..0000000000000
--- a/client/me/profile-links/creators.jsx
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
-* External dependencies
-*/
-var React = require( 'react' );
-
-/**
-* Internal dependencies
-*/
-
-var ProfileLinksAddWordPress = require( 'me/profile-links-add-wordpress' ),
-	ProfileLinksAddOther = require( 'me/profile-links-add-other' );
-
-module.exports = React.createClass( {
-
-	displayName: 'ProfileLinksCreators',
-
-	getDefaultProps: function() {
-		return{
-			showingForm: false
-		};
-	},
-
-	render: function() {
-		return(
-			<div>
-				{ 'wordpress' === this.props.showingForm &&
-					<ProfileLinksAddWordPress
-						userProfileLinks={ this.props.userProfileLinks }
-						onSuccess={ this.props.hideForms }
-						onCancel={ this.props.hideForms }
-					/>
-				}
-
-				{ 'other' === this.props.showingForm &&
-					<ProfileLinksAddOther
-						userProfileLinks={ this.props.userProfileLinks }
-						onSuccess={ this.props.hideForms }
-						onCancel={ this.props.hideForms }
-					/>
-				}
-			</div>
-		);
-	}
-} );
diff --git a/client/me/profile-links/index.jsx b/client/me/profile-links/index.jsx
index 80603768e324c..ad0aa8f37d955 100644
--- a/client/me/profile-links/index.jsx
+++ b/client/me/profile-links/index.jsx
@@ -9,12 +9,13 @@ var React = require( 'react' ),
  */
 var ProfileLink = require( 'me/profile-link' ),
 	observe = require( 'lib/mixins/data-observe' ),
-	ProfileLinkCreators = require( 'me/profile-links/creators' ),
 	AddProfileLinksButtons = require( 'me/profile-links/add-buttons' ),
 	SectionHeader = require( 'components/section-header' ),
 	Card = require( 'components/card' ),
 	Notice = require( 'components/notice' ),
-	eventRecorder = require( 'me/event-recorder' );
+	eventRecorder = require( 'me/event-recorder' ),
+	ProfileLinksAddWordPress = require( 'me/profile-links-add-wordpress' ),
+	ProfileLinksAddOther = require( 'me/profile-links-add-other' );
 
 module.exports = React.createClass( {
 
@@ -174,11 +175,21 @@ module.exports = React.createClass( {
 	},
 
 	renderForm() {
+		if ( 'wordpress' === this.state.showingForm ) {
+			return (
+				<ProfileLinksAddWordPress
+					userProfileLinks={ this.props.userProfileLinks }
+					onSuccess={ this.hideForms }
+					onCancel={ this.hideForms }
+				/>
+			);
+		}
+
 		return (
-			<ProfileLinkCreators
+			<ProfileLinksAddOther
 				userProfileLinks={ this.props.userProfileLinks }
-				showingForm={ this.state.showingForm }
-				hideForms={ this.hideForms }
+				onSuccess={ this.hideForms }
+				onCancel={ this.hideForms }
 			/>
 		);
 	},