diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 2e6c48d9c..c8483f591 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -1184,10 +1184,7 @@ BOOL LLPanelAvatar::postBuild()
 	ctrl->setEnabled(false);
 	getChild<LLUICtrl>("OK")->setCommitCallback(boost::bind(&LLPanelAvatar::onClickOK, this));
 	getChild<LLUICtrl>("Cancel")->setCommitCallback(boost::bind(&LLPanelAvatar::onClickCancel, this));
-	if (LLUICtrl* ctrl = findChild<LLUICtrl>("copy_key")) // Singu TODO: Bring this back
-		ctrl->setCommitCallback(boost::bind(&LLPanelAvatar::onClickGetKey, this));
-	void copy_profile_uri(const LLUUID& id, bool group);
-	getChild<LLUICtrl>("copy_uri")->setCommitCallback(boost::bind(copy_profile_uri, boost::bind(&LLPanelAvatar::getAvatarID, this), false));
+	getChild<LLUICtrl>("copy_flyout")->setCommitCallback(boost::bind(&LLPanelAvatar::onClickCopy, this, _2));
 	getChildView("web_profile")->setVisible(!gSavedSettings.getString("WebProfileURL").empty());
 
 	if (mTab && !sAllowFirstLife)
@@ -1421,11 +1418,18 @@ void LLPanelAvatar::resetGroupList()
 	}
 }
 
-void LLPanelAvatar::onClickGetKey()
+void LLPanelAvatar::onClickCopy(const LLSD& val)
 {
-	const LLUUID& agent_id(getAvatarID());
-	llinfos << "Copy agent id: " << agent_id << llendl;
-	gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(agent_id.asString()));
+	if (val.isUndefined())
+	{
+		llinfos << "Copy agent id: " << mAvatarID << llendl;
+		gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(mAvatarID.asString()));
+	}
+	else
+	{
+		void copy_profile_uri(const LLUUID& id, bool group = false);
+		copy_profile_uri(mAvatarID);
+	}
 }
 
 void LLPanelAvatar::onClickOK()
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index 8461e8d60..89cf3b5dc 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -313,7 +313,7 @@ public:
 	bool haveData() const { return mHaveProperties && mHaveStatistics; }
 	bool isEditable() const { return mAllowEdit; }
 
-	void onClickGetKey();
+	void onClickCopy(const LLSD& val);
 	void onClickOK();
 	void onClickCancel();
 
diff --git a/indra/newview/skins/default/xui/de/panel_avatar.xml b/indra/newview/skins/default/xui/de/panel_avatar.xml
index 5be8afbbc..1b5ba8c43 100644
--- a/indra/newview/skins/default/xui/de/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/de/panel_avatar.xml
@@ -5,7 +5,7 @@
 			<string name="CaptionTextAcctInfo">[ACCTTYPE]
 [PAYMENTINFO]
 [AGEVERIFICATION]</string>
-      <button label="Kopiere URI" tool_tip="SLURL in die Zwischenablage kopieren" name="copy_uri"/>
+      <flyout_button label="Kopiere:" tool_tip="Schlüssel in die Zwischenablage kopieren" name="copy_flyout"/>
       
       <button name="web_profile" label="Web Profil"/>
       <text name="Name:">Name:</text>
diff --git a/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index d6a208242..5e3b1f832 100644
--- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -9,7 +9,9 @@
 [PAYMENTINFO]
 [AGEVERIFICATION]
 			</string>
-      <button bottom="-24" follows="left|top" height="16" label="Copy URI" left="4" font="SansSerifSmall" tool_tip="Copy SLURL to clipboard" name="copy_uri" width="70"/>
+      <flyout_button bottom="-24" follows="left|top" height="16" label="Copy:" left="4" font="SansSerifSmall" tool_tip="Copy key to clipboard, press the arrow for other copy options" name="copy_flyout" width="70">
+        <flyout_button_item label="Copy SLURL" name="copy_slurl_item" value="1"/>
+      </flyout_button>
       <name_editor bevel_style="in" border_style="line"
 			     border_thickness="1" bottom="-24" enabled="false" follows="left|top"
 			     font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
diff --git a/indra/newview/skins/default/xui/es/panel_avatar.xml b/indra/newview/skins/default/xui/es/panel_avatar.xml
index 81d5f3e91..145c4179e 100644
--- a/indra/newview/skins/default/xui/es/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/es/panel_avatar.xml
@@ -7,7 +7,7 @@
 [PAYMENTINFO]
 [AGEVERIFICATION]
 			</string>
-			<button label="Copiar URI" tool_tip="Copyiar SLURL al portapapeles" name="copy_url"/>
+			<flyout_button label="Copiar:" tool_tip="Copyiar key al portapapeles" name="copy_flyout"/>
 			<name_editor name="avatar_key"/>
 			<button name="web_profile" label="Perfil Web"/>
 			<text name="Name:" >
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar.xml b/indra/newview/skins/default/xui/fr/panel_avatar.xml
index f93f67758..926f0b625 100644
--- a/indra/newview/skins/default/xui/fr/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_avatar.xml
@@ -151,7 +151,7 @@ vous avez écrit.
 			</text>
 			<text_editor bottom_delta="-260" height="240" name="notes edit" width="430"/>
 
-			<button name="copy_uri" label="Copy URI"/>
+			<flyout_button name="copy_flyout" label="Copy :"/>
 			<name_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
 			     border_thickness="1" bottom_delta="1" enabled="false" follows="left|top"
 			     font="SansSerifSmall" height="18" is_unicode="false" left_delta="95"