diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp
index 5823e6717..5d5461d79 100644
--- a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp
@@ -19,7 +19,6 @@
  *******************************************************************************/
 
 #include <QBuffer>
-#include <QMessageBox>
 
 #include "AlbumCreateDialog.h"
 #include "ui_AlbumCreateDialog.h"
@@ -38,7 +37,7 @@ AlbumCreateDialog::AlbumCreateDialog(TokenQueue *photoQueue, RsPhoto *rs_photo,
     
 
 #if QT_VERSION >= 0x040700
-    ui->lineEdit_Title->setPlaceholderText(tr("Untitle Album"));
+    ui->lineEdit_Title_2->setPlaceholderText(tr("Untitle Album"));
     ui->lineEdit_Caption_2->setPlaceholderText(tr("Say something about this album..."));
     //ui->textEdit_Description->setPlaceholderText(tr("Say something about this album...")) ;
     ui->lineEdit_Where->setPlaceholderText(tr("Where were these taken?"));
@@ -56,8 +55,7 @@ AlbumCreateDialog::AlbumCreateDialog(TokenQueue *photoQueue, RsPhoto *rs_photo,
     mPhotoDrop = ui->scrollAreaWidgetContents;
     mPhotoDrop->setPhotoItemHolder(this);
 
-    /* fill in the available OwnIds for sharing */
-	ui->IdChooser->loadIds(IDCHOOSER_ID_REQUIRED, RsGxsId());
+    
 }
 
 AlbumCreateDialog::~AlbumCreateDialog()
@@ -74,30 +72,12 @@ void AlbumCreateDialog::publishAlbum()
     // get fields for album to publish, publish and then exit dialog
     RsPhotoAlbum album;
 
-	RsGxsId authorId;
-	switch (ui->IdChooser->getChosenId(authorId)) {
-		case GxsIdChooser::KnowId:
-		case GxsIdChooser::UnKnowId:
-		break;
-		case GxsIdChooser::NoId:
-		case GxsIdChooser::None:
-		default:
-		std::cerr << "AlbumCreateDialog::publishAlbum() ERROR GETTING AuthorId!, Post Failed";
-		std::cerr << std::endl;
-
-		QMessageBox::warning(this, tr("RetroShare"),tr("Please create or choose a Signing Id first"), QMessageBox::Ok, QMessageBox::Ok);
-
-		return;
-	}
-
-    album.mMeta.mGroupName = ui->lineEdit_Title->text().toStdString();
-    album.mCategory = ui->comboBox_Category->currentText().toStdString();
     album.mCaption = ui->lineEdit_Caption_2->text().toStdString();
     album.mPhotographer = ui->lineEdit_Photographer->text().toStdString();
+    album.mMeta.mGroupName = ui->lineEdit_Title_2->text().toStdString();
     album.mDescription = ui->textEdit_Description->toPlainText().toStdString();
     album.mWhere = ui->lineEdit_Where->text().toStdString();
     album.mPhotographer = ui->lineEdit_Photographer->text().toStdString();
-    album.mMeta.mAuthorId = authorId;
     getAlbumThumbnail(album.mThumbnail);
 
 
diff --git a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui
index c471062bd..af5729fc9 100644
--- a/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui
+++ b/retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui
@@ -17,16 +17,7 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout_4">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
+   <property name="margin">
     <number>0</number>
    </property>
    <property name="spacing">
@@ -55,16 +46,7 @@
           <enum>QFrame::NoFrame</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_6">
-          <property name="leftMargin">
-           <number>0</number>
-          </property>
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
+          <property name="margin">
            <number>0</number>
           </property>
           <property name="spacing">
@@ -72,16 +54,7 @@
           </property>
           <item row="0" column="0">
            <layout class="QGridLayout" name="gridLayout_2">
-            <property name="leftMargin">
-             <number>3</number>
-            </property>
-            <property name="topMargin">
-             <number>3</number>
-            </property>
-            <property name="rightMargin">
-             <number>3</number>
-            </property>
-            <property name="bottomMargin">
+            <property name="margin">
              <number>3</number>
             </property>
             <item row="0" column="0">
@@ -92,7 +65,7 @@
              </widget>
             </item>
             <item row="0" column="1">
-             <widget class="QLineEdit" name="lineEdit_Title"/>
+             <widget class="QLineEdit" name="lineEdit_Title_2"/>
             </item>
             <item row="0" column="2" rowspan="2">
              <widget class="QToolButton" name="AlbumThumbNail">
@@ -137,7 +110,7 @@ border-radius: 10px;
              </widget>
             </item>
             <item row="1" column="1">
-             <widget class="QComboBox" name="comboBox_Category">
+             <widget class="QComboBox" name="comboBox_Category_2">
               <item>
                <property name="text">
                 <string>Animals</string>
@@ -381,13 +354,18 @@ border-radius: 10px;
                 </widget>
                </item>
                <item>
-                <widget class="GxsIdChooser" name="IdChooser">
+                <widget class="QComboBox" name="comboBox">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
+                 <item>
+                  <property name="text">
+                   <string>Publish with Identity</string>
+                  </property>
+                 </item>
                 </widget>
                </item>
               </layout>
@@ -453,8 +431,8 @@ p, li { white-space: pre-wrap; }
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>61</width>
-              <height>18</height>
+              <width>621</width>
+              <height>458</height>
              </rect>
             </property>
             <property name="styleSheet">
@@ -473,16 +451,7 @@ p, li { white-space: pre-wrap; }
    <item row="2" column="0">
     <widget class="QFrame" name="frame">
      <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <property name="leftMargin">
-       <number>9</number>
-      </property>
-      <property name="topMargin">
-       <number>9</number>
-      </property>
-      <property name="rightMargin">
-       <number>9</number>
-      </property>
-      <property name="bottomMargin">
+      <property name="margin">
        <number>9</number>
       </property>
       <item>
@@ -544,11 +513,6 @@ p, li { white-space: pre-wrap; }
    <header>gui/PhotoShare/PhotoDrop.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>GxsIdChooser</class>
-   <extends>QComboBox</extends>
-   <header>gui/gxs/GxsIdChooser.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>