diff --git a/.classpath b/.classpath
index b162b09..ac5d2ad 100644
--- a/.classpath
+++ b/.classpath
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/invite-friends-vre-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/invite-friends-vre-1.0.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/invite-friends-vre-1.0.0-SNAPSHOT/WEB-INF/classes" path="target/generated-sources/gwt">
+	<classpathentry kind="src" output="target/invite-friends-vre-1.0.1-SNAPSHOT/WEB-INF/classes" path="target/generated-sources/gwt">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/invite-friends-vre-1.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/invite-friends-vre-1.0.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -39,5 +39,5 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/invite-friends-vre-1.0.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/invite-friends-vre-1.0.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/pom.xml b/pom.xml
index e100ecd..f6d1e25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>invite-friends-vre</artifactId>
 	<packaging>war</packaging>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<name>Invite Friends to VRE</name>
 	<scm>
 		<connection>scm:svn:http://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/${project.artifactId}</connection>
diff --git a/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/FormViewImpl.java b/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/FormViewImpl.java
index ebb1c02..44e0165 100644
--- a/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/FormViewImpl.java
+++ b/src/main/java/org/gcube/portlets/user/invitefriends/client/ui/FormViewImpl.java
@@ -86,11 +86,14 @@ public class FormViewImpl extends Composite implements FormView, Editor<FormView
 					 sendInvite.click();				
 			}
 		});
+		
+		sendInvite.setEnabled(true);
 	}
 
 	@UiHandler("openModal")
 	void onUserClick(ClickEvent event) {
 		if (!delegate.onSendClick()) {
+			sendInvite.setEnabled(true);
 			feedback.setText("We will send the invitation email to: "+email.getText() + " and put you in cc, we'll never email your contacts without your say so.");
 			name.setText("");
 			modalWindow.show();
@@ -118,7 +121,7 @@ public class FormViewImpl extends Composite implements FormView, Editor<FormView
 				public void onSuccess(Boolean result) {
 					feedback.setText("Thanks for inviting, we sent the email correctly.");	
 					feedbackGroup.setType(ControlGroupType.SUCCESS);
-					sendInvite.removeFromParent();
+					sendInvite.setEnabled(false);
 					cancelInvite.setText("Close");
 					email.setText("");
 				}